From 1e98507501f106501d237e35c9dc7fbf7f0d4d38 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 3 Aug 2023 09:29:50 +0100
Subject: [PATCH 1/3] Fix AppTile context menu not always showing up when it
 has options

---
 src/components/views/elements/AppTile.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/elements/AppTile.tsx b/src/components/views/elements/AppTile.tsx
index 2c1125e56d3..57034e6b50f 100644
--- a/src/components/views/elements/AppTile.tsx
+++ b/src/components/views/elements/AppTile.tsx
@@ -134,8 +134,9 @@ export default class AppTile extends React.Component<IProps, IState> {
     private dispatcherRef?: string;
     private unmounted = false;
 
-    public constructor(props: IProps) {
+    public constructor(props: IProps, context: ContextType<typeof MatrixClientContext>) {
         super(props);
+        this.context = context;
 
         // Tiles in miniMode are floating, and therefore not docked
         if (!this.props.miniMode) {

From f38879fb4f97dfa2f9413b1a2a71170c79f6e483 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 3 Aug 2023 09:31:08 +0100
Subject: [PATCH 2/3] Comment

---
 src/components/views/elements/AppTile.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/elements/AppTile.tsx b/src/components/views/elements/AppTile.tsx
index 57034e6b50f..c71889545c9 100644
--- a/src/components/views/elements/AppTile.tsx
+++ b/src/components/views/elements/AppTile.tsx
@@ -136,7 +136,7 @@ export default class AppTile extends React.Component<IProps, IState> {
 
     public constructor(props: IProps, context: ContextType<typeof MatrixClientContext>) {
         super(props);
-        this.context = context;
+        this.context = context; // XXX: workaround for lack of `declare` support on `public context!:` definition
 
         // Tiles in miniMode are floating, and therefore not docked
         if (!this.props.miniMode) {

From 497cedc71d80b13a2f1de2ced7229abf217441e7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 3 Aug 2023 09:54:37 +0100
Subject: [PATCH 3/3] Update snapshots

---
 .../__snapshots__/AppTile-test.tsx.snap       | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/test/components/views/elements/__snapshots__/AppTile-test.tsx.snap b/test/components/views/elements/__snapshots__/AppTile-test.tsx.snap
index 70a1b899d0d..843ee980e1e 100644
--- a/test/components/views/elements/__snapshots__/AppTile-test.tsx.snap
+++ b/test/components/views/elements/__snapshots__/AppTile-test.tsx.snap
@@ -139,6 +139,19 @@ exports[`AppTile for a pinned widget should render 1`] = `
             class="mx_Icon mx_Icon_12"
           />
         </div>
+        <div
+          aria-expanded="false"
+          aria-haspopup="true"
+          aria-label="Options"
+          class="mx_AccessibleButton mx_AppTileMenuBar_widgets_button"
+          role="button"
+          tabindex="0"
+          title="Options"
+        >
+          <div
+            class="mx_Icon mx_Icon_12"
+          />
+        </div>
       </span>
     </div>
     <div
@@ -201,6 +214,19 @@ exports[`AppTile for a pinned widget should render permission request 1`] = `
             class="mx_Icon mx_Icon_12"
           />
         </div>
+        <div
+          aria-expanded="false"
+          aria-haspopup="true"
+          aria-label="Options"
+          class="mx_AccessibleButton mx_AppTileMenuBar_widgets_button"
+          role="button"
+          tabindex="0"
+          title="Options"
+        >
+          <div
+            class="mx_Icon mx_Icon_12"
+          />
+        </div>
       </span>
     </div>
     <div
@@ -341,6 +367,19 @@ exports[`AppTile preserves non-persisted widget on container move 1`] = `
                   class="mx_Icon mx_Icon_12"
                 />
               </div>
+              <div
+                aria-expanded="false"
+                aria-haspopup="true"
+                aria-label="Options"
+                class="mx_AccessibleButton mx_AppTileMenuBar_widgets_button"
+                role="button"
+                tabindex="0"
+                title="Options"
+              >
+                <div
+                  class="mx_Icon mx_Icon_12"
+                />
+              </div>
             </span>
           </div>
           <div