From c569e8914aa7a49b513f2f255aa96f4131bc8431 Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Tue, 12 May 2026 12:31:21 +0100
Subject: [PATCH] Park up changes

---
 .../components/views/elements/Measured.tsx    |   6 +
 apps/web/src/stores/UIStore.ts                |   1 +
 .../viewmodels/room/RoomUploadViewModel.tsx   |   1 -
 .../__snapshots__/RoomView-test.tsx.snap      | 320 ++++++++++--------
 .../with-open-auto.png                        | Bin 0 -> 24681 bytes
 .../UploadButton/UploadButton.stories.tsx     |  83 +++--
 .../UploadButton/UploadButton.test.tsx        |   4 +-
 .../composer/UploadButton/UploadButton.tsx    |  13 +-
 .../__snapshots__/UploadButton.test.tsx.snap  |   4 +-
 9 files changed, 259 insertions(+), 173 deletions(-)
 create mode 100644 packages/shared-components/__vis__/linux/__baselines__/room/composer/UploadButton/UploadButton.stories.tsx/with-open-auto.png

diff --git a/apps/web/src/components/views/elements/Measured.tsx b/apps/web/src/components/views/elements/Measured.tsx
index b0f084c0ed..9b1d337468 100644
--- a/apps/web/src/components/views/elements/Measured.tsx
+++ b/apps/web/src/components/views/elements/Measured.tsx
@@ -31,17 +31,23 @@ export default class Measured extends React.PureComponent<IProps> {
     }
 
     public componentDidMount(): void {
+        console.log("Measured componentDidMount", this.props.sensor.current);
+        if (this.props.sensor.current) {
+            UIStore.instance.trackElementDimensions(`Measured${this.instanceId}`, this.props.sensor.current);
+        }
         UIStore.instance.on(`Measured${this.instanceId}`, this.onResize);
     }
 
     public componentDidUpdate(prevProps: Readonly<IProps>): void {
         const previous = prevProps.sensor.current;
         const current = this.props.sensor.current;
+        console.log("Measured componentDidUpdate", current);
         if (previous === current) return;
         if (previous) {
             UIStore.instance.stopTrackingElementDimensions(`Measured${this.instanceId}`);
         }
         if (current) {
+            console.log("Measured trackElementDimensions");
             UIStore.instance.trackElementDimensions(`Measured${this.instanceId}`, current);
         }
     }
diff --git a/apps/web/src/stores/UIStore.ts b/apps/web/src/stores/UIStore.ts
index 0792bb206d..8106bcd5f0 100644
--- a/apps/web/src/stores/UIStore.ts
+++ b/apps/web/src/stores/UIStore.ts
@@ -88,6 +88,7 @@ export default class UIStore extends EventEmitter {
         entries.forEach((entry) => {
             const trackedElementName = this.trackedUiElements.get(entry.target);
             if (trackedElementName) {
+                console.log("resizeObserverCallback for tracked", trackedElementName);
                 this.uiElementDimensions.set(trackedElementName, entry.contentRect);
                 this.emit(trackedElementName, UI_EVENTS.Resize, entry);
             }
diff --git a/apps/web/src/viewmodels/room/RoomUploadViewModel.tsx b/apps/web/src/viewmodels/room/RoomUploadViewModel.tsx
index 6d9aa2e489..5ec12c3a28 100644
--- a/apps/web/src/viewmodels/room/RoomUploadViewModel.tsx
+++ b/apps/web/src/viewmodels/room/RoomUploadViewModel.tsx
@@ -229,7 +229,6 @@ export function RoomUploadContextProvider({
     });
 
     useEffect(() => {
-        console.log("Reply to event!", replyToEvent);
         vm.setReplyToEvent(replyToEvent);
     }, [vm, replyToEvent]);
 
diff --git a/apps/web/test/unit-tests/components/structures/__snapshots__/RoomView-test.tsx.snap b/apps/web/test/unit-tests/components/structures/__snapshots__/RoomView-test.tsx.snap
index d093f4da0e..330c897bfb 100644
--- a/apps/web/test/unit-tests/components/structures/__snapshots__/RoomView-test.tsx.snap
+++ b/apps/web/test/unit-tests/components/structures/__snapshots__/RoomView-test.tsx.snap
@@ -212,7 +212,7 @@ exports[`RoomView for a local room in state ERROR should match the snapshot 1`]
         </div>
       </div>
       <div
-        aria-labelledby="_r_1cl_"
+        aria-labelledby="_r_1dt_"
         class="_banner_n7ud0_8"
         data-type="critical"
         role="status"
@@ -238,7 +238,7 @@ exports[`RoomView for a local room in state ERROR should match the snapshot 1`]
         >
           <p
             class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _title_mcq5y_24"
-            id="_r_1cl_"
+            id="_r_1dt_"
           >
             Could not start a chat with this user
           </p>
@@ -423,7 +423,7 @@ exports[`RoomView for a local room in state NEW should match the snapshot 1`] =
             >
               <svg
                 aria-label="Messages in this room are not end-to-end encrypted"
-                aria-labelledby="_r_19j_"
+                aria-labelledby="_r_1an_"
                 class="mx_E2EIcon mx_MessageComposer_e2eIcon"
                 color="var(--cpd-color-icon-info-primary)"
                 fill="currentColor"
@@ -608,24 +608,32 @@ exports[`RoomView for a local room in state NEW should match the snapshot 1`] =
                   />
                 </svg>
               </div>
-              <div
-                aria-label="Attachment"
-                class="mx_AccessibleButton mx_MessageComposer_button"
+              <button
+                aria-labelledby="_r_1bs_"
+                class="_icon-button_1215g_8"
+                data-kind="primary"
                 role="button"
+                style="--cpd-icon-button-size: 32px;"
                 tabindex="0"
+                title="Attachment"
               >
-                <svg
-                  fill="currentColor"
-                  height="1em"
-                  viewBox="0 0 24 24"
-                  width="1em"
-                  xmlns="http://www.w3.org/2000/svg"
+                <div
+                  class="_indicator-icon_147l5_17"
+                  style="--cpd-icon-button-size: 100%;"
                 >
-                  <path
-                    d="M11.5 22q-2.3 0-3.9-1.6T6 16.5V6q0-1.65 1.175-2.825T10 2t2.825 1.175T14 6v9.5q0 1.05-.725 1.775T11.5 18t-1.775-.725T9 15.5V6.75A.73.73 0 0 1 9.75 6a.73.73 0 0 1 .75.75v8.75q0 .424.287.712.288.288.713.288.424 0 .713-.288a.97.97 0 0 0 .287-.712V6q0-1.05-.725-1.775T10 3.5t-1.775.725T7.5 6v10.5q0 1.65 1.175 2.825T11.5 20.5t2.825-1.175T15.5 16.5V6.75a.73.73 0 0 1 .75-.75.73.73 0 0 1 .75.75v9.75q0 2.3-1.6 3.9T11.5 22"
-                  />
-                </svg>
-              </div>
+                  <svg
+                    fill="currentColor"
+                    height="1em"
+                    viewBox="0 0 24 24"
+                    width="1em"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M11.5 22q-2.3 0-3.9-1.6T6 16.5V6q0-1.65 1.175-2.825T10 2t2.825 1.175T14 6v9.5q0 1.05-.725 1.775T11.5 18t-1.775-.725T9 15.5V6.75A.73.73 0 0 1 9.75 6a.73.73 0 0 1 .75.75v8.75q0 .424.287.712.288.288.713.288.424 0 .713-.288a.97.97 0 0 0 .287-.712V6q0-1.05-.725-1.775T10 3.5t-1.775.725T7.5 6v10.5q0 1.65 1.175 2.825T11.5 20.5t2.825-1.175T15.5 16.5V6.75a.73.73 0 0 1 .75-.75.73.73 0 0 1 .75.75v9.75q0 2.3-1.6 3.9T11.5 22"
+                    />
+                  </svg>
+                </div>
+              </button>
               <div
                 aria-label="More options"
                 class="mx_AccessibleButton mx_MessageComposer_button mx_MessageComposer_buttonMenu"
@@ -702,7 +710,7 @@ exports[`RoomView for a local room in state NEW that is encrypted should match t
             </span>
             <svg
               aria-label="New members see history"
-              aria-labelledby="_r_1cf_"
+              aria-labelledby="_r_1dn_"
               class="mx_RoomHeader_icon"
               color="var(--cpd-color-icon-info-primary)"
               fill="currentColor"
@@ -981,24 +989,32 @@ exports[`RoomView for a local room in state NEW that is encrypted should match t
                   />
                 </svg>
               </div>
-              <div
-                aria-label="Attachment"
-                class="mx_AccessibleButton mx_MessageComposer_button"
+              <button
+                aria-labelledby="_r_1dc_"
+                class="_icon-button_1215g_8"
+                data-kind="primary"
                 role="button"
+                style="--cpd-icon-button-size: 32px;"
                 tabindex="0"
+                title="Attachment"
               >
-                <svg
-                  fill="currentColor"
-                  height="1em"
-                  viewBox="0 0 24 24"
-                  width="1em"
-                  xmlns="http://www.w3.org/2000/svg"
+                <div
+                  class="_indicator-icon_147l5_17"
+                  style="--cpd-icon-button-size: 100%;"
                 >
-                  <path
-                    d="M11.5 22q-2.3 0-3.9-1.6T6 16.5V6q0-1.65 1.175-2.825T10 2t2.825 1.175T14 6v9.5q0 1.05-.725 1.775T11.5 18t-1.775-.725T9 15.5V6.75A.73.73 0 0 1 9.75 6a.73.73 0 0 1 .75.75v8.75q0 .424.287.712.288.288.713.288.424 0 .713-.288a.97.97 0 0 0 .287-.712V6q0-1.05-.725-1.775T10 3.5t-1.775.725T7.5 6v10.5q0 1.65 1.175 2.825T11.5 20.5t2.825-1.175T15.5 16.5V6.75a.73.73 0 0 1 .75-.75.73.73 0 0 1 .75.75v9.75q0 2.3-1.6 3.9T11.5 22"
-                  />
-                </svg>
-              </div>
+                  <svg
+                    fill="currentColor"
+                    height="1em"
+                    viewBox="0 0 24 24"
+                    width="1em"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M11.5 22q-2.3 0-3.9-1.6T6 16.5V6q0-1.65 1.175-2.825T10 2t2.825 1.175T14 6v9.5q0 1.05-.725 1.775T11.5 18t-1.775-.725T9 15.5V6.75A.73.73 0 0 1 9.75 6a.73.73 0 0 1 .75.75v8.75q0 .424.287.712.288.288.713.288.424 0 .713-.288a.97.97 0 0 0 .287-.712V6q0-1.05-.725-1.775T10 3.5t-1.775.725T7.5 6v10.5q0 1.65 1.175 2.825T11.5 20.5t2.825-1.175T15.5 16.5V6.75a.73.73 0 0 1 .75-.75.73.73 0 0 1 .75.75v9.75q0 2.3-1.6 3.9T11.5 22"
+                    />
+                  </svg>
+                </div>
+              </button>
               <div
                 aria-label="More options"
                 class="mx_AccessibleButton mx_MessageComposer_button mx_MessageComposer_buttonMenu"
@@ -1599,24 +1615,32 @@ exports[`RoomView should hide the header when hideHeader=true 1`] = `
                     />
                   </svg>
                 </div>
-                <div
-                  aria-label="Attachment"
-                  class="mx_AccessibleButton mx_MessageComposer_button"
+                <button
+                  aria-labelledby="_r_27_"
+                  class="_icon-button_1215g_8"
+                  data-kind="primary"
                   role="button"
+                  style="--cpd-icon-button-size: 32px;"
                   tabindex="0"
+                  title="Attachment"
                 >
-                  <svg
-                    fill="currentColor"
-                    height="1em"
-                    viewBox="0 0 24 24"
-                    width="1em"
-                    xmlns="http://www.w3.org/2000/svg"
+                  <div
+                    class="_indicator-icon_147l5_17"
+                    style="--cpd-icon-button-size: 100%;"
                   >
-                    <path
-                      d="M11.5 22q-2.3 0-3.9-1.6T6 16.5V6q0-1.65 1.175-2.825T10 2t2.825 1.175T14 6v9.5q0 1.05-.725 1.775T11.5 18t-1.775-.725T9 15.5V6.75A.73.73 0 0 1 9.75 6a.73.73 0 0 1 .75.75v8.75q0 .424.287.712.288.288.713.288.424 0 .713-.288a.97.97 0 0 0 .287-.712V6q0-1.05-.725-1.775T10 3.5t-1.775.725T7.5 6v10.5q0 1.65 1.175 2.825T11.5 20.5t2.825-1.175T15.5 16.5V6.75a.73.73 0 0 1 .75-.75.73.73 0 0 1 .75.75v9.75q0 2.3-1.6 3.9T11.5 22"
-                    />
-                  </svg>
-                </div>
+                    <svg
+                      fill="currentColor"
+                      height="1em"
+                      viewBox="0 0 24 24"
+                      width="1em"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M11.5 22q-2.3 0-3.9-1.6T6 16.5V6q0-1.65 1.175-2.825T10 2t2.825 1.175T14 6v9.5q0 1.05-.725 1.775T11.5 18t-1.775-.725T9 15.5V6.75A.73.73 0 0 1 9.75 6a.73.73 0 0 1 .75.75v8.75q0 .424.287.712.288.288.713.288.424 0 .713-.288a.97.97 0 0 0 .287-.712V6q0-1.05-.725-1.775T10 3.5t-1.775.725T7.5 6v10.5q0 1.65 1.175 2.825T11.5 20.5t2.825-1.175T15.5 16.5V6.75a.73.73 0 0 1 .75-.75.73.73 0 0 1 .75.75v9.75q0 2.3-1.6 3.9T11.5 22"
+                      />
+                    </svg>
+                  </div>
+                </button>
                 <div
                   aria-label="More options"
                   class="mx_AccessibleButton mx_MessageComposer_button mx_MessageComposer_buttonMenu"
@@ -1724,7 +1748,7 @@ exports[`RoomView should hide the pinned message banner when hidePinnedMessageBa
               style="--cpd-icon-button-size: 100%;"
             >
               <svg
-                aria-labelledby="_r_5e_"
+                aria-labelledby="_r_5i_"
                 fill="currentColor"
                 height="1em"
                 viewBox="0 0 24 24"
@@ -1751,7 +1775,7 @@ exports[`RoomView should hide the pinned message banner when hidePinnedMessageBa
               style="--cpd-icon-button-size: 100%;"
             >
               <svg
-                aria-labelledby="_r_5j_"
+                aria-labelledby="_r_5n_"
                 fill="currentColor"
                 height="1em"
                 viewBox="0 0 24 24"
@@ -1766,7 +1790,7 @@ exports[`RoomView should hide the pinned message banner when hidePinnedMessageBa
           </button>
           <button
             aria-label="Threads"
-            aria-labelledby="_r_5o_"
+            aria-labelledby="_r_5s_"
             class="_icon-button_1215g_8"
             data-kind="primary"
             role="button"
@@ -1793,7 +1817,7 @@ exports[`RoomView should hide the pinned message banner when hidePinnedMessageBa
           </button>
           <button
             aria-label="Room info"
-            aria-labelledby="_r_5t_"
+            aria-labelledby="_r_61_"
             class="_icon-button_1215g_8"
             data-kind="primary"
             role="button"
@@ -1823,7 +1847,7 @@ exports[`RoomView should hide the pinned message banner when hidePinnedMessageBa
           >
             <div
               aria-label="0 members"
-              aria-labelledby="_r_62_"
+              aria-labelledby="_r_66_"
               class="mx_AccessibleButton mx_FacePile"
               role="button"
               tabindex="0"
@@ -1890,7 +1914,7 @@ exports[`RoomView should hide the pinned message banner when hidePinnedMessageBa
               >
                 <svg
                   aria-label="Messages in this room are not end-to-end encrypted"
-                  aria-labelledby="_r_6e_"
+                  aria-labelledby="_r_6i_"
                   class="mx_E2EIcon mx_MessageComposer_e2eIcon"
                   color="var(--cpd-color-icon-info-primary)"
                   fill="currentColor"
@@ -2075,24 +2099,32 @@ exports[`RoomView should hide the pinned message banner when hidePinnedMessageBa
                     />
                   </svg>
                 </div>
-                <div
-                  aria-label="Attachment"
-                  class="mx_AccessibleButton mx_MessageComposer_button"
+                <button
+                  aria-labelledby="_r_7n_"
+                  class="_icon-button_1215g_8"
+                  data-kind="primary"
                   role="button"
+                  style="--cpd-icon-button-size: 32px;"
                   tabindex="0"
+                  title="Attachment"
                 >
-                  <svg
-                    fill="currentColor"
-                    height="1em"
-                    viewBox="0 0 24 24"
-                    width="1em"
-                    xmlns="http://www.w3.org/2000/svg"
+                  <div
+                    class="_indicator-icon_147l5_17"
+                    style="--cpd-icon-button-size: 100%;"
                   >
-                    <path
-                      d="M11.5 22q-2.3 0-3.9-1.6T6 16.5V6q0-1.65 1.175-2.825T10 2t2.825 1.175T14 6v9.5q0 1.05-.725 1.775T11.5 18t-1.775-.725T9 15.5V6.75A.73.73 0 0 1 9.75 6a.73.73 0 0 1 .75.75v8.75q0 .424.287.712.288.288.713.288.424 0 .713-.288a.97.97 0 0 0 .287-.712V6q0-1.05-.725-1.775T10 3.5t-1.775.725T7.5 6v10.5q0 1.65 1.175 2.825T11.5 20.5t2.825-1.175T15.5 16.5V6.75a.73.73 0 0 1 .75-.75.73.73 0 0 1 .75.75v9.75q0 2.3-1.6 3.9T11.5 22"
-                    />
-                  </svg>
-                </div>
+                    <svg
+                      fill="currentColor"
+                      height="1em"
+                      viewBox="0 0 24 24"
+                      width="1em"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M11.5 22q-2.3 0-3.9-1.6T6 16.5V6q0-1.65 1.175-2.825T10 2t2.825 1.175T14 6v9.5q0 1.05-.725 1.775T11.5 18t-1.775-.725T9 15.5V6.75A.73.73 0 0 1 9.75 6a.73.73 0 0 1 .75.75v8.75q0 .424.287.712.288.288.713.288.424 0 .713-.288a.97.97 0 0 0 .287-.712V6q0-1.05-.725-1.775T10 3.5t-1.775.725T7.5 6v10.5q0 1.65 1.175 2.825T11.5 20.5t2.825-1.175T15.5 16.5V6.75a.73.73 0 0 1 .75-.75.73.73 0 0 1 .75.75v9.75q0 2.3-1.6 3.9T11.5 22"
+                      />
+                    </svg>
+                  </div>
+                </button>
                 <div
                   aria-label="More options"
                   class="mx_AccessibleButton mx_MessageComposer_button mx_MessageComposer_buttonMenu"
@@ -2200,7 +2232,7 @@ exports[`RoomView should hide the right panel when hideRightPanel=true 1`] = `
               style="--cpd-icon-button-size: 100%;"
             >
               <svg
-                aria-labelledby="_r_2g_"
+                aria-labelledby="_r_2i_"
                 fill="currentColor"
                 height="1em"
                 viewBox="0 0 24 24"
@@ -2227,7 +2259,7 @@ exports[`RoomView should hide the right panel when hideRightPanel=true 1`] = `
               style="--cpd-icon-button-size: 100%;"
             >
               <svg
-                aria-labelledby="_r_2l_"
+                aria-labelledby="_r_2n_"
                 fill="currentColor"
                 height="1em"
                 viewBox="0 0 24 24"
@@ -2242,7 +2274,7 @@ exports[`RoomView should hide the right panel when hideRightPanel=true 1`] = `
           </button>
           <button
             aria-label="Threads"
-            aria-labelledby="_r_2q_"
+            aria-labelledby="_r_2s_"
             class="_icon-button_1215g_8"
             data-kind="primary"
             role="button"
@@ -2269,7 +2301,7 @@ exports[`RoomView should hide the right panel when hideRightPanel=true 1`] = `
           </button>
           <button
             aria-label="Room info"
-            aria-labelledby="_r_2v_"
+            aria-labelledby="_r_31_"
             class="_icon-button_1215g_8"
             data-kind="primary"
             role="button"
@@ -2299,7 +2331,7 @@ exports[`RoomView should hide the right panel when hideRightPanel=true 1`] = `
           >
             <div
               aria-label="0 members"
-              aria-labelledby="_r_34_"
+              aria-labelledby="_r_36_"
               class="mx_AccessibleButton mx_FacePile mx_FacePile_toggled"
               role="button"
               tabindex="0"
@@ -2366,7 +2398,7 @@ exports[`RoomView should hide the right panel when hideRightPanel=true 1`] = `
               >
                 <svg
                   aria-label="Messages in this room are not end-to-end encrypted"
-                  aria-labelledby="_r_3g_"
+                  aria-labelledby="_r_3i_"
                   class="mx_E2EIcon mx_MessageComposer_e2eIcon"
                   color="var(--cpd-color-icon-info-primary)"
                   fill="currentColor"
@@ -2551,24 +2583,32 @@ exports[`RoomView should hide the right panel when hideRightPanel=true 1`] = `
                     />
                   </svg>
                 </div>
-                <div
-                  aria-label="Attachment"
-                  class="mx_AccessibleButton mx_MessageComposer_button"
+                <button
+                  aria-labelledby="_r_4n_"
+                  class="_icon-button_1215g_8"
+                  data-kind="primary"
                   role="button"
+                  style="--cpd-icon-button-size: 32px;"
                   tabindex="0"
+                  title="Attachment"
                 >
-                  <svg
-                    fill="currentColor"
-                    height="1em"
-                    viewBox="0 0 24 24"
-                    width="1em"
-                    xmlns="http://www.w3.org/2000/svg"
+                  <div
+                    class="_indicator-icon_147l5_17"
+                    style="--cpd-icon-button-size: 100%;"
                   >
-                    <path
-                      d="M11.5 22q-2.3 0-3.9-1.6T6 16.5V6q0-1.65 1.175-2.825T10 2t2.825 1.175T14 6v9.5q0 1.05-.725 1.775T11.5 18t-1.775-.725T9 15.5V6.75A.73.73 0 0 1 9.75 6a.73.73 0 0 1 .75.75v8.75q0 .424.287.712.288.288.713.288.424 0 .713-.288a.97.97 0 0 0 .287-.712V6q0-1.05-.725-1.775T10 3.5t-1.775.725T7.5 6v10.5q0 1.65 1.175 2.825T11.5 20.5t2.825-1.175T15.5 16.5V6.75a.73.73 0 0 1 .75-.75.73.73 0 0 1 .75.75v9.75q0 2.3-1.6 3.9T11.5 22"
-                    />
-                  </svg>
-                </div>
+                    <svg
+                      fill="currentColor"
+                      height="1em"
+                      viewBox="0 0 24 24"
+                      width="1em"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M11.5 22q-2.3 0-3.9-1.6T6 16.5V6q0-1.65 1.175-2.825T10 2t2.825 1.175T14 6v9.5q0 1.05-.725 1.775T11.5 18t-1.775-.725T9 15.5V6.75A.73.73 0 0 1 9.75 6a.73.73 0 0 1 .75.75v8.75q0 .424.287.712.288.288.713.288.424 0 .713-.288a.97.97 0 0 0 .287-.712V6q0-1.05-.725-1.775T10 3.5t-1.775.725T7.5 6v10.5q0 1.65 1.175 2.825T11.5 20.5t2.825-1.175T15.5 16.5V6.75a.73.73 0 0 1 .75-.75.73.73 0 0 1 .75.75v9.75q0 2.3-1.6 3.9T11.5 22"
+                      />
+                    </svg>
+                  </div>
+                </button>
                 <div
                   aria-label="More options"
                   class="mx_AccessibleButton mx_MessageComposer_button mx_MessageComposer_buttonMenu"
@@ -2676,7 +2716,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
               style="--cpd-icon-button-size: 100%;"
             >
               <svg
-                aria-labelledby="_r_fc_"
+                aria-labelledby="_r_fo_"
                 fill="currentColor"
                 height="1em"
                 viewBox="0 0 24 24"
@@ -2703,7 +2743,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
               style="--cpd-icon-button-size: 100%;"
             >
               <svg
-                aria-labelledby="_r_fh_"
+                aria-labelledby="_r_ft_"
                 fill="currentColor"
                 height="1em"
                 viewBox="0 0 24 24"
@@ -2718,7 +2758,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
           </button>
           <button
             aria-label="Threads"
-            aria-labelledby="_r_fm_"
+            aria-labelledby="_r_g2_"
             class="_icon-button_1215g_8"
             data-kind="primary"
             role="button"
@@ -2745,7 +2785,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
           </button>
           <button
             aria-label="Room info"
-            aria-labelledby="_r_fr_"
+            aria-labelledby="_r_g7_"
             class="_icon-button_1215g_8"
             data-kind="primary"
             role="button"
@@ -2775,7 +2815,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
           >
             <div
               aria-label="0 members"
-              aria-labelledby="_r_g0_"
+              aria-labelledby="_r_gc_"
               class="mx_AccessibleButton mx_FacePile"
               role="button"
               tabindex="0"
@@ -2881,7 +2921,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
                 </span>
                 <svg
                   aria-label="New members see history"
-                  aria-labelledby="_r_gc_"
+                  aria-labelledby="_r_go_"
                   class="mx_RoomHeader_icon"
                   color="var(--cpd-color-icon-info-primary)"
                   fill="currentColor"
@@ -2914,7 +2954,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
               style="--cpd-icon-button-size: 100%;"
             >
               <svg
-                aria-labelledby="_r_fc_"
+                aria-labelledby="_r_fo_"
                 fill="currentColor"
                 height="1em"
                 viewBox="0 0 24 24"
@@ -2941,7 +2981,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
               style="--cpd-icon-button-size: 100%;"
             >
               <svg
-                aria-labelledby="_r_fh_"
+                aria-labelledby="_r_ft_"
                 fill="currentColor"
                 height="1em"
                 viewBox="0 0 24 24"
@@ -2956,7 +2996,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
           </button>
           <button
             aria-label="Threads"
-            aria-labelledby="_r_fm_"
+            aria-labelledby="_r_g2_"
             class="_icon-button_1215g_8"
             data-kind="primary"
             role="button"
@@ -2983,7 +3023,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
           </button>
           <button
             aria-label="Room info"
-            aria-labelledby="_r_fr_"
+            aria-labelledby="_r_g7_"
             class="_icon-button_1215g_8"
             data-kind="primary"
             role="button"
@@ -3013,7 +3053,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
           >
             <div
               aria-label="0 members"
-              aria-labelledby="_r_g0_"
+              aria-labelledby="_r_gc_"
               class="mx_AccessibleButton mx_FacePile"
               role="button"
               tabindex="0"
@@ -3082,7 +3122,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
                   tabindex="0"
                 >
                   <div
-                    aria-labelledby="_r_gh_"
+                    aria-labelledby="_r_gt_"
                     class="mx_E2EIcon mx_MessageComposer_e2eIcon"
                     data-testid="e2e-icon"
                     style="width: 12px; height: 12px;"
@@ -3275,24 +3315,32 @@ exports[`RoomView should not display the timeline when the room encryption is lo
                     />
                   </svg>
                 </div>
-                <div
-                  aria-label="Attachment"
-                  class="mx_AccessibleButton mx_MessageComposer_button"
+                <button
+                  aria-labelledby="_r_i2_"
+                  class="_icon-button_1215g_8"
+                  data-kind="primary"
                   role="button"
+                  style="--cpd-icon-button-size: 32px;"
                   tabindex="0"
+                  title="Attachment"
                 >
-                  <svg
-                    fill="currentColor"
-                    height="1em"
-                    viewBox="0 0 24 24"
-                    width="1em"
-                    xmlns="http://www.w3.org/2000/svg"
+                  <div
+                    class="_indicator-icon_147l5_17"
+                    style="--cpd-icon-button-size: 100%;"
                   >
-                    <path
-                      d="M11.5 22q-2.3 0-3.9-1.6T6 16.5V6q0-1.65 1.175-2.825T10 2t2.825 1.175T14 6v9.5q0 1.05-.725 1.775T11.5 18t-1.775-.725T9 15.5V6.75A.73.73 0 0 1 9.75 6a.73.73 0 0 1 .75.75v8.75q0 .424.287.712.288.288.713.288.424 0 .713-.288a.97.97 0 0 0 .287-.712V6q0-1.05-.725-1.775T10 3.5t-1.775.725T7.5 6v10.5q0 1.65 1.175 2.825T11.5 20.5t2.825-1.175T15.5 16.5V6.75a.73.73 0 0 1 .75-.75.73.73 0 0 1 .75.75v9.75q0 2.3-1.6 3.9T11.5 22"
-                    />
-                  </svg>
-                </div>
+                    <svg
+                      fill="currentColor"
+                      height="1em"
+                      viewBox="0 0 24 24"
+                      width="1em"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M11.5 22q-2.3 0-3.9-1.6T6 16.5V6q0-1.65 1.175-2.825T10 2t2.825 1.175T14 6v9.5q0 1.05-.725 1.775T11.5 18t-1.775-.725T9 15.5V6.75A.73.73 0 0 1 9.75 6a.73.73 0 0 1 .75.75v8.75q0 .424.287.712.288.288.713.288.424 0 .713-.288a.97.97 0 0 0 .287-.712V6q0-1.05-.725-1.775T10 3.5t-1.775.725T7.5 6v10.5q0 1.65 1.175 2.825T11.5 20.5t2.825-1.175T15.5 16.5V6.75a.73.73 0 0 1 .75-.75.73.73 0 0 1 .75.75v9.75q0 2.3-1.6 3.9T11.5 22"
+                      />
+                    </svg>
+                  </div>
+                </button>
                 <div
                   aria-label="More options"
                   class="mx_AccessibleButton mx_MessageComposer_button mx_MessageComposer_buttonMenu"
@@ -3418,7 +3466,7 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
           </button>
           <button
             aria-label="Chat"
-            aria-labelledby="_r_ks_"
+            aria-labelledby="_r_lc_"
             class="_icon-button_1215g_8"
             data-kind="primary"
             role="button"
@@ -3445,7 +3493,7 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
           </button>
           <button
             aria-label="Threads"
-            aria-labelledby="_r_l1_"
+            aria-labelledby="_r_lh_"
             class="_icon-button_1215g_8"
             data-kind="primary"
             role="button"
@@ -3472,7 +3520,7 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
           </button>
           <button
             aria-label="Room info"
-            aria-labelledby="_r_l6_"
+            aria-labelledby="_r_lm_"
             class="_icon-button_1215g_8"
             data-kind="primary"
             role="button"
@@ -3502,7 +3550,7 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
           >
             <div
               aria-label="0 members"
-              aria-labelledby="_r_lb_"
+              aria-labelledby="_r_lr_"
               class="mx_AccessibleButton mx_FacePile"
               role="button"
               tabindex="0"
@@ -3587,7 +3635,7 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
                 </p>
               </div>
               <button
-                aria-labelledby="_r_lk_"
+                aria-labelledby="_r_m4_"
                 class="_icon-button_1215g_8"
                 data-kind="secondary"
                 data-testid="base-card-close-button"
@@ -3647,7 +3695,7 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
                   >
                     <svg
                       aria-label="Messages in this room are not end-to-end encrypted"
-                      aria-labelledby="_r_lp_"
+                      aria-labelledby="_r_m9_"
                       class="mx_E2EIcon mx_MessageComposer_e2eIcon"
                       color="var(--cpd-color-icon-info-primary)"
                       fill="currentColor"
@@ -3832,24 +3880,32 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
                         />
                       </svg>
                     </div>
-                    <div
-                      aria-label="Attachment"
-                      class="mx_AccessibleButton mx_MessageComposer_button"
+                    <button
+                      aria-labelledby="_r_ne_"
+                      class="_icon-button_1215g_8"
+                      data-kind="primary"
                       role="button"
+                      style="--cpd-icon-button-size: 32px;"
                       tabindex="0"
+                      title="Attachment"
                     >
-                      <svg
-                        fill="currentColor"
-                        height="1em"
-                        viewBox="0 0 24 24"
-                        width="1em"
-                        xmlns="http://www.w3.org/2000/svg"
+                      <div
+                        class="_indicator-icon_147l5_17"
+                        style="--cpd-icon-button-size: 100%;"
                       >
-                        <path
-                          d="M11.5 22q-2.3 0-3.9-1.6T6 16.5V6q0-1.65 1.175-2.825T10 2t2.825 1.175T14 6v9.5q0 1.05-.725 1.775T11.5 18t-1.775-.725T9 15.5V6.75A.73.73 0 0 1 9.75 6a.73.73 0 0 1 .75.75v8.75q0 .424.287.712.288.288.713.288.424 0 .713-.288a.97.97 0 0 0 .287-.712V6q0-1.05-.725-1.775T10 3.5t-1.775.725T7.5 6v10.5q0 1.65 1.175 2.825T11.5 20.5t2.825-1.175T15.5 16.5V6.75a.73.73 0 0 1 .75-.75.73.73 0 0 1 .75.75v9.75q0 2.3-1.6 3.9T11.5 22"
-                        />
-                      </svg>
-                    </div>
+                        <svg
+                          fill="currentColor"
+                          height="1em"
+                          viewBox="0 0 24 24"
+                          width="1em"
+                          xmlns="http://www.w3.org/2000/svg"
+                        >
+                          <path
+                            d="M11.5 22q-2.3 0-3.9-1.6T6 16.5V6q0-1.65 1.175-2.825T10 2t2.825 1.175T14 6v9.5q0 1.05-.725 1.775T11.5 18t-1.775-.725T9 15.5V6.75A.73.73 0 0 1 9.75 6a.73.73 0 0 1 .75.75v8.75q0 .424.287.712.288.288.713.288.424 0 .713-.288a.97.97 0 0 0 .287-.712V6q0-1.05-.725-1.775T10 3.5t-1.775.725T7.5 6v10.5q0 1.65 1.175 2.825T11.5 20.5t2.825-1.175T15.5 16.5V6.75a.73.73 0 0 1 .75-.75.73.73 0 0 1 .75.75v9.75q0 2.3-1.6 3.9T11.5 22"
+                          />
+                        </svg>
+                      </div>
+                    </button>
                     <div
                       aria-label="More options"
                       class="mx_AccessibleButton mx_MessageComposer_button mx_MessageComposer_buttonMenu"
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room/composer/UploadButton/UploadButton.stories.tsx/with-open-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/composer/UploadButton/UploadButton.stories.tsx/with-open-auto.png
new file mode 100644
index 0000000000000000000000000000000000000000..5aa3297aead63bbe7ce2cd550a8e172ffb0f006f
GIT binary patch
literal 24681
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
QLJR8jNu3iJe_3DuKOx@$y#N3J

literal 0
HcmV?d00001

diff --git a/packages/shared-components/src/room/composer/UploadButton/UploadButton.stories.tsx b/packages/shared-components/src/room/composer/UploadButton/UploadButton.stories.tsx
index 4d540e1be7..8abe732b43 100644
--- a/packages/shared-components/src/room/composer/UploadButton/UploadButton.stories.tsx
+++ b/packages/shared-components/src/room/composer/UploadButton/UploadButton.stories.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { type JSX } from "react";
-import { type Meta, type StoryFn } from "@storybook/react-vite";
+import { type StoryObj, type Meta } from "@storybook/react-vite";
 import { fn } from "storybook/test";
 import { AttachmentIcon, ReactionIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
@@ -16,22 +16,49 @@ import { withViewDocs } from "../../../../.storybook/withViewDocs";
 
 const UploadButtonWrapperImpl = ({
     onUploadOptionSelected,
+    defaultOpen,
     ...rest
-}: UploadButtonViewSnapshot & UploadButtonViewActions): JSX.Element => {
+}: UploadButtonViewSnapshot & UploadButtonViewActions & { defaultOpen: boolean }): JSX.Element => {
     const vm = useMockedViewModel(rest, {
         onUploadOptionSelected,
     });
-    return <UploadButton vm={vm} />;
+    return <UploadButton defaultOpen={defaultOpen} vm={vm} />;
 };
 
 const UploadButtonWrapper = withViewDocs(UploadButtonWrapperImpl, UploadButton);
 
-export default {
+const meta = {
     title: "Room/UploadButton",
     component: UploadButtonWrapper,
     tags: ["autodocs"],
     args: {
+        mayUpload: true,
+        defaultOpen: false,
         onUploadOptionSelected: fn(),
+        options: [
+            {
+                type: "local",
+                label: "Attachment",
+                icon: AttachmentIcon,
+            },
+            {
+                label: "Fun Button",
+                icon: ReactionIcon,
+                type: "fun",
+            },
+        ],
+    },
+} satisfies Meta<typeof UploadButtonWrapper>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};
+
+export const WithOneOption: Story = {
+    // No visible difference
+    tags: ["skip-test"],
+    args: {
         options: [
             {
                 type: "local",
@@ -40,34 +67,28 @@ export default {
             },
         ],
     },
-} satisfies Meta<typeof UploadButtonWrapper>;
-
-const Template: StoryFn<typeof UploadButtonWrapper> = (args) => <UploadButtonWrapper {...args} />;
-
-export const Default = Template.bind({});
-Default.args = {
-    options: [
-        {
-            type: "local",
-            label: "Attachment",
-            icon: AttachmentIcon,
-        },
-        {
-            label: "Fun Button",
-            icon: ReactionIcon,
-            type: "fun",
-        },
-    ],
 };
 
-export const WithOneOption = Template.bind({});
-
-WithOneOption.args = {
-    options: [
-        {
-            type: "local",
-            label: "Attachment",
-            icon: AttachmentIcon,
+export const WithOpen: Story = {
+    args: {
+        defaultOpen: true,
+    },
+    parameters: {
+        a11y: {
+            config: {
+                rules: [
+                    {
+                        // Menu contains a header which is invalid
+                        id: "aria-required-children",
+                        enabled: false,
+                    },
+                    {
+                        // Menu pops open by default
+                        id: "aria-hidden-focus",
+                        enabled: false,
+                    },
+                ],
+            },
         },
-    ],
+    },
 };
diff --git a/packages/shared-components/src/room/composer/UploadButton/UploadButton.test.tsx b/packages/shared-components/src/room/composer/UploadButton/UploadButton.test.tsx
index bbe3d70605..13a754b997 100644
--- a/packages/shared-components/src/room/composer/UploadButton/UploadButton.test.tsx
+++ b/packages/shared-components/src/room/composer/UploadButton/UploadButton.test.tsx
@@ -23,7 +23,7 @@ describe("UploadButton", () => {
     it("can open the menu and select an option", async () => {
         const onUploadOptionSelected = fn();
         const { container, getByRole } = render(<Default onUploadOptionSelected={onUploadOptionSelected} />);
-        await userEvent.click(getByRole("button", { name: "Open attachment menu" }));
+        await userEvent.click(getByRole("button", { name: "Attachment" }));
         expect(container).toMatchSnapshot();
         await userEvent.click(screen.getByRole("menuitem", { name: "Fun Button" }));
         expect(onUploadOptionSelected).toHaveBeenCalledWith("fun");
@@ -33,7 +33,7 @@ describe("UploadButton", () => {
         const onUploadOptionSelected = fn();
         const { getByRole } = render(<Default onUploadOptionSelected={onUploadOptionSelected} />);
         await userEvent.keyboard("[ControlLeft>]");
-        await userEvent.click(getByRole("button", { name: "Open attachment menu" }));
+        await userEvent.click(getByRole("button", { name: "Attachment" }));
         expect(onUploadOptionSelected).toHaveBeenCalledWith("local");
     });
 });
diff --git a/packages/shared-components/src/room/composer/UploadButton/UploadButton.tsx b/packages/shared-components/src/room/composer/UploadButton/UploadButton.tsx
index fc259c07c6..956e667df4 100644
--- a/packages/shared-components/src/room/composer/UploadButton/UploadButton.tsx
+++ b/packages/shared-components/src/room/composer/UploadButton/UploadButton.tsx
@@ -23,7 +23,7 @@ import { useViewModel, type ViewModel } from "../../../core/viewmodel";
 
 export interface UploadButtonViewSnapshot {
     mayUpload: boolean;
-    options: { type: string; label: string; icon: ComponentType<SVGAttributes<SVGElement>> }[];
+    options: { type: string; label: string; icon?: ComponentType<SVGAttributes<SVGElement>> }[];
 }
 
 export interface UploadButtonViewActions {
@@ -41,12 +41,15 @@ export interface UploadButtonViewActions {
  */
 export function UploadButton({
     vm,
+    defaultOpen = false,
     ...rootButtonProps
 }: PropsWithChildren<
-    { vm: ViewModel<UploadButtonViewSnapshot, UploadButtonViewActions> } & ComponentProps<typeof IconButton>
+    { vm: ViewModel<UploadButtonViewSnapshot, UploadButtonViewActions>; defaultOpen?: boolean } & ComponentProps<
+        typeof IconButton
+    >
 >): ReactElement {
     const i18n = useI18n();
-    const [open, setOpen] = useState(false);
+    const [open, setOpen] = useState(defaultOpen);
     const { options } = useViewModel(vm);
     // Ctrl+click is a shortcut to selecting the first item.
     // N.B. Clicking and shift clicking is handled by radix and
@@ -68,10 +71,10 @@ export function UploadButton({
             <IconButton
                 {...rootButtonProps}
                 tooltip={label}
-                title={label}
+                aria-label={label}
                 onClick={() => vm.onUploadOptionSelected(options[0].type)}
             >
-                <Icon />
+                {Icon ? <Icon /> : <AttachmentIcon />}
             </IconButton>
         );
     }
diff --git a/packages/shared-components/src/room/composer/UploadButton/__snapshots__/UploadButton.test.tsx.snap b/packages/shared-components/src/room/composer/UploadButton/__snapshots__/UploadButton.test.tsx.snap
index 3c28593c3b..afdb980723 100644
--- a/packages/shared-components/src/room/composer/UploadButton/__snapshots__/UploadButton.test.tsx.snap
+++ b/packages/shared-components/src/room/composer/UploadButton/__snapshots__/UploadButton.test.tsx.snap
@@ -18,7 +18,7 @@ exports[`UploadButton > can open the menu and select an option 1`] = `
     role="button"
     style="--cpd-icon-button-size: 32px;"
     tabindex="0"
-    title="Open attachment menu"
+    title="Attachment"
     type="button"
   >
     <div
@@ -55,7 +55,7 @@ exports[`UploadButton > renders a default button 1`] = `
     role="button"
     style="--cpd-icon-button-size: 32px;"
     tabindex="0"
-    title="Open attachment menu"
+    title="Attachment"
     type="button"
   >
     <div