Revert "MessageComposerButtons: don't hide moreButtons behind dropdow…

…n in wide mode" This reverts commit 5fd0906.
matrix-org · Jun 29, 2022 · 5697af3 · 5697af3
1 parent 5fd0906
commit 5697af3
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 41 deletions.
diff --git a/mkpriv.sh b/mkpriv.sh
diff --git a/src/components/views/rooms/MessageComposerButtons.tsx b/src/components/views/rooms/MessageComposerButtons.tsx
@@ -103,15 +103,11 @@ const MessageComposerButtons: React.FC<IProps> = (props: IProps) => {
 
     return <UploadButtonContextProvider roomId={roomId} relation={props.relation}>
         { mainButtons }
-        { moreButtons.length > 0 &&
-            (narrow ?
-                <AccessibleTooltipButton
-                    className={moreOptionsClasses}
-                    onClick={props.toggleButtonMenu}
-                    title={_t("More options")}
-                /> : moreButtons
-            )
-        }
+        { moreButtons.length > 0 && <AccessibleTooltipButton
+            className={moreOptionsClasses}
+            onClick={props.toggleButtonMenu}
+            title={_t("More options")}
+        /> }
         { props.isMenuOpen && (
             <IconizedContextMenu
                 onFinished={props.toggleButtonMenu}

diff --git a/test/components/views/rooms/MessageComposerButtons-test.tsx b/test/components/views/rooms/MessageComposerButtons-test.tsx
@@ -40,7 +40,7 @@ const mockProps: React.ComponentProps<typeof MessageComposerButtons> = {
 };
 
 describe("MessageComposerButtons", () => {
-    it("Renders all buttons in wide mode", () => {
+    it("Renders emoji and upload buttons in wide mode", () => {
         const buttons = wrapAndRender(
             <MessageComposerButtons
                 isMenuOpen={false}
@@ -55,10 +55,32 @@ describe("MessageComposerButtons", () => {
         expect(buttonLabels(buttons)).toEqual([
             "Emoji",
             "Attachment",
-            "Sticker",
-            "Voice Message",
-            "Poll",
-            "Location",
+            "More options",
+        ]);
+    });
+
+    it("Renders other buttons in menu in wide mode", () => {
+        const buttons = wrapAndRender(
+            <MessageComposerButtons
+                isMenuOpen={true}
+                showLocationButton={true}
+                showPollsButton={true}
+                showStickersButton={true}
+                {...mockProps}
+            />,
+            false,
+        );
+
+        expect(buttonLabels(buttons)).toEqual([
+            "Emoji",
+            "Attachment",
+            "More options",
+            [
+                "Sticker",
+                "Voice Message",
+                "Poll",
+                "Location",
+            ],
         ]);
     });