Merge branch 'main' into fix-colorpicker-focus-blip

openstax · Mar 22, 2024 · 89fed4b · 89fed4b
2 parents 39d18eb + e28d229
commit 89fed4b
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 7 deletions.
diff --git a/src/app/components/DotMenu.tsx b/src/app/components/DotMenu.tsx
@@ -19,13 +19,20 @@ export const DotMenuIcon = styled(EllipsisV)`
 `;
 
 // tslint:disable-next-line:variable-name
-export const DotMenuToggle = styled(React.forwardRef<HTMLDivElement>((props, ref) =>
-  <PlainButton {...props} ref={ref}>
-    <div tabIndex={-1}>
-      <DotMenuIcon />
-    </div>
-  </PlainButton>
-))`
+export const DotMenuToggle = styled(
+  React.forwardRef<HTMLDivElement, {isOpen: boolean}>(
+    ({isOpen, ...props}, ref) => {
+
+      return (
+        <PlainButton aria-label='Actions' aria-expanded={isOpen} {...props} ref={ref}>
+          <div tabIndex={-1}>
+            <DotMenuIcon />
+          </div>
+        </PlainButton>
+      );
+    }
+  )
+)`
   border: none;
   display: block;
 

diff --git a/src/app/components/__snapshots__/DotMenu.spec.tsx.snap b/src/app/components/__snapshots__/DotMenu.spec.tsx.snap
@@ -202,6 +202,7 @@ exports[`Dropdown matches snapshot 1`] = `
     className="c3 c4"
   >
     <button
+      aria-label="Actions"
       className="c5 c6 c7 c8"
       tabIndex={0}
     >
@@ -247,6 +248,7 @@ exports[`Dropdown matches snapshot 1`] = `
     </ol>
   </div>
   <button
+    aria-label="Actions"
     className="c5 c6 c7 c8"
     tabIndex={0}
   >
@@ -473,6 +475,7 @@ exports[`Dropdown matches snapshot on right align 1`] = `
     className="c3 c4"
   >
     <button
+      aria-label="Actions"
       className="c5 c6 c7 c8"
       tabIndex={0}
     >
@@ -518,6 +521,7 @@ exports[`Dropdown matches snapshot on right align 1`] = `
     </ol>
   </div>
   <button
+    aria-label="Actions"
     className="c5 c6 c7 c8"
     tabIndex={0}
   >

diff --git a/src/app/content/highlights/components/SummaryPopup/__snapshots__/ContextMenu.spec.tsx.snap b/src/app/content/highlights/components/SummaryPopup/__snapshots__/ContextMenu.spec.tsx.snap
@@ -102,6 +102,7 @@ exports[`ContextMenu match snapshot when closed 1`] = `
     className="c1 c2 c3"
   >
     <button
+      aria-expanded={false}
       aria-label="Edit this highlight"
       className="c4 c5 c6 c7 c8"
       onClick={[Function]}
@@ -575,6 +576,7 @@ exports[`ContextMenu match snapshot when open 1`] = `
     className="c1 c2 c3"
   >
     <button
+      aria-expanded={true}
       aria-label="Edit this highlight"
       className="c4 c5 c6 c7 c8"
       onClick={[Function]}

diff --git a/src/app/content/highlights/components/__snapshots__/DisplayNote.spec.tsx.snap b/src/app/content/highlights/components/__snapshots__/DisplayNote.spec.tsx.snap
@@ -126,6 +126,8 @@ exports[`DisplayNote matches snapshot 1`] = `
     className="c1 c2 c3"
   >
     <button
+      aria-expanded={false}
+      aria-label="Actions"
       className="c4 c5 c6 c7"
       onClick={[Function]}
     >
@@ -330,6 +332,8 @@ exports[`DisplayNote matches snapshot when focused 1`] = `
     className="c1 c2 c3"
   >
     <button
+      aria-expanded={false}
+      aria-label="Actions"
       className="c4 c5 c6 c7"
       onClick={[Function]}
     >
@@ -585,6 +589,8 @@ exports[`DisplayNote matches snapshot when focused with opened dropdown 1`] = `
     className="c1 c2 c3"
   >
     <button
+      aria-expanded={true}
+      aria-label="Actions"
       className="c4 c5 c6 c7"
       onClick={[Function]}
     >

diff --git a/src/app/developer/components/__snapshots__/Home.spec.tsx.snap b/src/app/developer/components/__snapshots__/Home.spec.tsx.snap
@@ -621,6 +621,8 @@ Array [
                     className="c12 c13 c14"
                   >
                     <button
+                      aria-expanded={false}
+                      aria-label="Actions"
                       className="c15 c16 c17 c18"
                       onClick={[Function]}
                     >
@@ -667,6 +669,8 @@ Array [
                     className="c12 c13 c14"
                   >
                     <button
+                      aria-expanded={false}
+                      aria-label="Actions"
                       className="c15 c16 c17 c18"
                       onClick={[Function]}
                     >