Merge branch 'develop' into eva/debugging

Author: evaSUry

src/app/components/StateRoute/AxMap/Ax.tsx

@@ -1,4 +1,5 @@
 import React, { useState, useRef } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
 import { Group } from '@visx/group';
 import { hierarchy, Tree } from '@visx/hierarchy';
 import { LinearGradient } from '@visx/gradient';
@@ -9,6 +10,9 @@ import { useTooltip, useTooltipInPortal, defaultStyles } from '@visx/tooltip';
 import ToolTipDataDisplay from './ToolTipDataDisplay';
 import { ToolTipStyles } from '../../../FrontendTypes';
 import { localPoint } from '@visx/event';
+import AxLegend from './axLegend';
+import { renderAxLegend } from '../../../slices/AxSlices/axLegendSlice';
+import type { RootState } from '../../../store';
 
 //still using below themes?
 const theme = {
@@ -314,21 +318,39 @@ export default function AxTree(props) {
   populateNodeAxArr(rootAxNode);
   console.log('nodeAxArr: ', nodeAxArr);
 
+  const {
+    containerRef // Access to the container's bounding box. This will be empty on first render.
+  } = useTooltipInPortal({
+    // Visx hook
+    detectBounds: true, // use TooltipWithBounds
+    scroll: true, // when tooltip containers are scrolled, this will correctly update the Tooltip position
+  });
+
+  // ax Legend
+  const { axLegendButtonClicked } = useSelector((state: RootState) => state.axLegend);
+  const dispatch = useDispatch();
+
   return totalWidth < 10 ? null : (
     <div>
-      <LinkControls
-        layout={layout}
-        orientation={orientation}
-        linkType={linkType}
-        stepPercent={stepPercent}
-        setLayout={setLayout}
-        setOrientation={setOrientation}
-        setLinkType={setLinkType}
-        setStepPercent={setStepPercent}
-      />
+      <div id='axControls'>
+        <LinkControls
+          layout={layout}
+          orientation={orientation}
+          linkType={linkType}
+          stepPercent={stepPercent}
+          setLayout={setLayout}
+          setOrientation={setOrientation}
+          setLinkType={setLinkType}
+          setStepPercent={setStepPercent}
+        />
+
+        <button id='axLegendButton' onClick={() => dispatch(renderAxLegend())}>
+          Generate Ax Tree Legend
+        </button>
+      </div>
 
       {/* svg references purple background */}
-      <svg ref={containerRef} width={totalWidth} height={totalHeight + 0}>
+      <svg ref={containerRef} width={totalWidth + 0.2*totalWidth} height={totalHeight}>
         <LinearGradient id='root-gradient' from='#488689' to='#3c6e71' />
         <LinearGradient id='parent-gradient' from='#488689' to='#3c6e71' />
         <rect 
@@ -346,7 +368,7 @@ export default function AxTree(props) {
             separation={(a, b) => (a.parent === b.parent ? 0.5 : 0.5) / a.depth}
           >
             {(tree) => (
-              <Group top={origin.y + 35} left={origin.x + 50 / aspect}>
+              <Group top={origin.y + 35} left={origin.x + 110}>
                 {tree.links().map((link, i) => (
                   <LinkComponent
                     key={i}
@@ -598,6 +620,14 @@ export default function AxTree(props) {
           </div>
         </TooltipInPortal>
       )}
+      
+      {/* ax Legend */}
+      <div>
+        { axLegendButtonClicked ? 
+          <AxLegend /> : ''
+        }
+      </div>
+      
     </div>
   );
 }

src/app/components/StateRoute/AxMap/axLegend.tsx

@@ -0,0 +1,25 @@
+import React from 'react';
+
+const AxLegend = () => {
+    return (
+        <div style={{borderStyle: 'solid'}}>
+            Nodes from the accessibility tree have either a role <strong>role</strong> or <strong>internalRole</strong>
+            <ul>
+                <li>
+                    <i><b>Role</b></i> refers to <strong> ARIA </strong> roles, which indicate the purpose of the element to assistive technologies, like screen readers.
+                    All of the nodes rendered in this tree have a role of 'role'
+                </li>
+                <li>
+                    <i><b>internalRole</b></i> refers to browser-specific roles <strong> Chrome </strong> for its own accessibility processing
+                </li>
+            </ul>
+
+            <p> Each node is given a property labeled <strong>ignored</strong>. </p>
+            <p> Nodes read by the screen reader have their ignored property evaluate to <strong>false</strong>. 
+            Nodes not read by the screen reader evaluate to <strong>true</strong>.</p>
+            <p> Nodes labeled <strong>"visible node with no name"</strong> have the ignored property set to false, but are not given a name</p>
+        </div>
+    );
+}
+
+export default AxLegend;

src/app/slices/AxSlices/axLegendSlice.tsx

@@ -0,0 +1,18 @@
+import { createSlice } from '@reduxjs/toolkit';
+
+export const axLegendSlice = createSlice({
+    name: 'axLegend',
+    initialState: {
+        axLegendButtonClicked: false,
+    },
+    reducers: {
+        renderAxLegend: (state) => {
+            if (!state.axLegendButtonClicked) state.axLegendButtonClicked = true;
+            else state.axLegendButtonClicked = false;
+        }
+    }
+})
+
+export const { renderAxLegend } = axLegendSlice.actions;
+
+export default axLegendSlice.reducer;

src/app/store.ts

@@ -1,11 +1,15 @@
 //Import store from redux tool kit
 import { configureStore } from '@reduxjs/toolkit';
 import { mainSlice } from './slices/mainSlice';
+import { axLegendSlice } from './slices/AxSlices/axLegendSlice';
 
 //Export Store
 export const store = configureStore({
   reducer: {
     main: mainSlice.reducer,
+    axLegend: axLegendSlice.reducer,
   },
   middleware: (getDefaultMiddleware) => getDefaultMiddleware({ serializableCheck: false }),
 });
+
+export type RootState = ReturnType<typeof store.getState>

src/app/styles/components/_ax.scss

@@ -0,0 +1,6 @@
+// Ax.tsx
+#axControls {
+    display: inline-flex;
+    position: sticky;
+    left: 0;
+}

src/app/styles/layout/_stateContainer.scss

@@ -19,16 +19,15 @@
   box-shadow: none;
 }
 
-.state-container .navbar {
-  //background-color: $state-background;
-  //color: #ff0000;
-  display: flex;
-  flex-direction: row;
-  justify-content: flex-start;
-  align-items: center;
-  height: 30px;
-  position: static;
-}
+// .state-container .navbar {
+//   //background-color: $state-background;
+//   //color: #ff0000;
+//   display: flex;
+//   flex-direction: row;
+//   justify-content: flex-start;
+//   align-items: center;
+//   height: 30px;
+// }
 
 .state-container .main-navbar {
   background-color: $state-background;
@@ -60,13 +59,14 @@
   height: 35px;
 }
 
-.navbar {
-  color: #ff0000;
-  // prevent navbar from scrolling with state/tree display
-  left: 0px;
-  z-index: 1;
-  @extend %disable-highlight;
-}
+// .navbar {
+//   color: #ff0000;
+//   // prevent navbar from scrolling with state/tree display
+//   position: sticky;
+//   left: 0;
+//   top: 0;
+//   @extend %disable-highlight;
+// }
 
 .no-data-message {
   color: #ff0001;

src/app/styles/main.scss

@@ -43,7 +43,7 @@
 // 5. Components
 @import 'components/buttons', 'components/actionComponent',
 'components/jsonTree', 'components/renderingFrequency',
-'components/performanceVisx', 'components/componentMap';
+'components/performanceVisx', 'components/componentMap', 'components/ax';
 
 // slider component
 @import './components/rc-slider', './components/sliderHandle';