From 67959825fb8f3b1b210fa295573f587e620e11ba Mon Sep 17 00:00:00 2001
From: Alun Turner <alunt@element.io>
Date: Mon, 13 Feb 2023 14:14:30 +0000
Subject: [PATCH 1/6] add conditional rendering for indent and unindent buttons

---
 .../components/FormattingButtons.tsx          | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/components/views/rooms/wysiwyg_composer/components/FormattingButtons.tsx b/src/components/views/rooms/wysiwyg_composer/components/FormattingButtons.tsx
index 7bc4b33d412..36ca4b6a61e 100644
--- a/src/components/views/rooms/wysiwyg_composer/components/FormattingButtons.tsx
+++ b/src/components/views/rooms/wysiwyg_composer/components/FormattingButtons.tsx
@@ -88,6 +88,7 @@ interface FormattingButtonsProps {
 
 export function FormattingButtons({ composer, actionStates }: FormattingButtonsProps): JSX.Element {
     const composerContext = useComposerContext();
+    const isInList = actionStates.unorderedList === "reversed" || actionStates.orderedList === "reversed";
     return (
         <div className="mx_FormattingButtons">
             <Button
@@ -129,18 +130,22 @@ export function FormattingButtons({ composer, actionStates }: FormattingButtonsP
                 onClick={() => composer.orderedList()}
                 icon={<NumberedListIcon className="mx_FormattingButtons_Icon" />}
             />
-            <Button
-                actionState={actionStates.indent}
-                label={_td("Indent increase")}
-                onClick={() => composer.indent()}
-                icon={<IndentIcon className="mx_FormattingButtons_Icon" />}
-            />
-            <Button
-                actionState={actionStates.unIndent}
-                label={_td("Indent decrease")}
-                onClick={() => composer.unIndent()}
-                icon={<UnIndentIcon className="mx_FormattingButtons_Icon" />}
-            />
+            {isInList && (
+                <Button
+                    actionState={actionStates.indent}
+                    label={_td("Indent increase")}
+                    onClick={() => composer.indent()}
+                    icon={<IndentIcon className="mx_FormattingButtons_Icon" />}
+                />
+            )}
+            {isInList && (
+                <Button
+                    actionState={actionStates.unindent}
+                    label={_td("Indent decrease")}
+                    onClick={() => composer.unindent()}
+                    icon={<UnIndentIcon className="mx_FormattingButtons_Icon" />}
+                />
+            )}
             <Button
                 actionState={actionStates.quote}
                 label={_td("Quote")}

From bfcfadfc85a08ebf3966acf649fb7ddf05386a87 Mon Sep 17 00:00:00 2001
From: Alun Turner <alunt@element.io>
Date: Mon, 13 Feb 2023 14:14:46 +0000
Subject: [PATCH 2/6] bump rich text editor version to 1.1.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b8747795111..02649d60d99 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
     "dependencies": {
         "@babel/runtime": "^7.12.5",
         "@matrix-org/analytics-events": "^0.4.0",
-        "@matrix-org/matrix-wysiwyg": "^0.23.0",
+        "@matrix-org/matrix-wysiwyg": "^1.1.0",
         "@matrix-org/react-sdk-module-api": "^0.0.3",
         "@sentry/browser": "^7.0.0",
         "@sentry/tracing": "^7.0.0",

From 62b0609e89d913a5eb21a1bd14366e29744a50ac Mon Sep 17 00:00:00 2001
From: Alun Turner <alunt@element.io>
Date: Mon, 13 Feb 2023 14:38:45 +0000
Subject: [PATCH 3/6] change tests to account for conditional rendering

---
 .../components/FormattingButtons-test.tsx     | 30 ++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/test/components/views/rooms/wysiwyg_composer/components/FormattingButtons-test.tsx b/test/components/views/rooms/wysiwyg_composer/components/FormattingButtons-test.tsx
index d0d774c7f06..b1df007bb52 100644
--- a/test/components/views/rooms/wysiwyg_composer/components/FormattingButtons-test.tsx
+++ b/test/components/views/rooms/wysiwyg_composer/components/FormattingButtons-test.tsx
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import React from "react";
-import { render, screen } from "@testing-library/react";
+import { cleanup, render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { ActionState, ActionTypes, AllActionStates, FormattingFunctions } from "@matrix-org/matrix-wysiwyg";
 
@@ -40,7 +40,7 @@ const mockWysiwyg = {
 const openLinkModalSpy = jest.spyOn(LinkModal, "openLinkModal");
 
 const testCases: Record<
-    Exclude<ActionTypes, "undo" | "redo" | "clear">,
+    Exclude<ActionTypes, "undo" | "redo" | "clear" | "indent" | "unindent">,
     { label: string; mockFormatFn: jest.Func | jest.SpyInstance }
 > = {
     bold: { label: "Bold", mockFormatFn: mockWysiwyg.bold },
@@ -53,8 +53,6 @@ const testCases: Record<
     orderedList: { label: "Numbered list", mockFormatFn: mockWysiwyg.orderedList },
     unorderedList: { label: "Bulleted list", mockFormatFn: mockWysiwyg.unorderedList },
     quote: { label: "Quote", mockFormatFn: mockWysiwyg.quote },
-    indent: { label: "Indent increase", mockFormatFn: mockWysiwyg.indent },
-    unIndent: { label: "Indent decrease", mockFormatFn: mockWysiwyg.unIndent },
 };
 
 const createActionStates = (state: ActionState): AllActionStates => {
@@ -162,4 +160,28 @@ describe("FormattingButtons", () => {
             expect(screen.getByLabelText(label)).not.toHaveClass("mx_FormattingButtons_Button_hover");
         }
     });
+
+    it("Does not show indent or unindent button when outside a list", () => {
+        renderComponent();
+
+        expect(screen.queryByLabelText("Indent increase")).not.toBeInTheDocument();
+        expect(screen.queryByLabelText("Indent decrease")).not.toBeInTheDocument();
+    });
+
+    it("Shows indent and unindent buttons when either list is reversed", () => {
+        const orderedListActive = { ...createActionStates("reversed"), orderedList: "active" };
+        renderComponent({ actionStates: orderedListActive });
+
+        expect(screen.getByLabelText("Indent increase")).toBeInTheDocument();
+        expect(screen.getByLabelText("Indent decrease")).toBeInTheDocument();
+
+        cleanup();
+
+        const unorderedListActive = { ...createActionStates("reversed"), unorderedList: "active" };
+
+        renderComponent({ actionStates: unorderedListActive });
+
+        expect(screen.getByLabelText("Indent increase")).toBeInTheDocument();
+        expect(screen.getByLabelText("Indent decrease")).toBeInTheDocument();
+    });
 });

From 8742c86576dc6fe04a7857df006d4bc7ab48e0eb Mon Sep 17 00:00:00 2001
From: Alun Turner <alunt@element.io>
Date: Mon, 13 Feb 2023 14:43:09 +0000
Subject: [PATCH 4/6] update lock file

---
 yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 0579f14b411..7019f83ec18 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1589,10 +1589,10 @@
   resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-js/-/matrix-sdk-crypto-js-0.1.0-alpha.2.tgz#a09d0fea858e817da971a3c9f904632ef7b49eb6"
   integrity sha512-oVkBCh9YP7H9i4gAoQbZzswniczfo/aIptNa4dxRi4Ff9lSvUCFv6Hvzi7C+90c0/PWZLXjIDTIAWZYmwyd2fA==
 
-"@matrix-org/matrix-wysiwyg@^0.23.0":
-  version "0.23.0"
-  resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-0.23.0.tgz#32242b18ae9dbb28d920c31f50bbac87ff4317fe"
-  integrity sha512-wO5KYznlfsSIMo0R8tyZqfvZrPkQMaL1qBHzhaeKIsC4vK4MnJ9mj6JiS6+XiuHJyc9nqN+IdeUjKyJOnStHaA==
+"@matrix-org/matrix-wysiwyg@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-1.1.0.tgz#45d55265485fdfa8592682d84aa3300e9e69a5c9"
+  integrity sha512-cbQGj6RPWupJgrqxGdeaKomBU2rOhRljaGoN/cRzlvlgcIYWZks0E4ULqzZRDsBHchH+ccPfMziGKK8ScdjaZg==
 
 "@matrix-org/olm@https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.14.tgz":
   version "3.2.14"

From 5fa367bd80a1bb69d527b9822d6fe438ac2e417c Mon Sep 17 00:00:00 2001
From: Alun Turner <alunt@element.io>
Date: Mon, 13 Feb 2023 16:11:42 +0000
Subject: [PATCH 5/6] improve clarity of new tests

---
 .../wysiwyg_composer/components/FormattingButtons-test.tsx  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/components/views/rooms/wysiwyg_composer/components/FormattingButtons-test.tsx b/test/components/views/rooms/wysiwyg_composer/components/FormattingButtons-test.tsx
index b1df007bb52..c33c29ae1c6 100644
--- a/test/components/views/rooms/wysiwyg_composer/components/FormattingButtons-test.tsx
+++ b/test/components/views/rooms/wysiwyg_composer/components/FormattingButtons-test.tsx
@@ -168,8 +168,8 @@ describe("FormattingButtons", () => {
         expect(screen.queryByLabelText("Indent decrease")).not.toBeInTheDocument();
     });
 
-    it("Shows indent and unindent buttons when either list is reversed", () => {
-        const orderedListActive = { ...createActionStates("reversed"), orderedList: "active" };
+    it("Shows indent and unindent buttons when either a single list type is 'reversed'", () => {
+        const orderedListActive = { ...defaultActionStates, orderedList: "reversed" };
         renderComponent({ actionStates: orderedListActive });
 
         expect(screen.getByLabelText("Indent increase")).toBeInTheDocument();
@@ -177,7 +177,7 @@ describe("FormattingButtons", () => {
 
         cleanup();
 
-        const unorderedListActive = { ...createActionStates("reversed"), unorderedList: "active" };
+        const unorderedListActive = { ...defaultActionStates, unorderedList: "reversed" };
 
         renderComponent({ actionStates: unorderedListActive });
 

From 9603411ce5144b893e0895f3af85d7cade060347 Mon Sep 17 00:00:00 2001
From: Alun Turner <alunt@element.io>
Date: Tue, 14 Feb 2023 08:52:50 +0000
Subject: [PATCH 6/6] bump rte to 1.1.1

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 0f4e52d2e6d..d6759cc2475 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
     "dependencies": {
         "@babel/runtime": "^7.12.5",
         "@matrix-org/analytics-events": "^0.4.0",
-        "@matrix-org/matrix-wysiwyg": "^1.1.0",
+        "@matrix-org/matrix-wysiwyg": "^1.1.1",
         "@matrix-org/react-sdk-module-api": "^0.0.3",
         "@sentry/browser": "^7.0.0",
         "@sentry/tracing": "^7.0.0",
diff --git a/yarn.lock b/yarn.lock
index 669cff7d176..3b2d7a04061 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1589,10 +1589,10 @@
   resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-js/-/matrix-sdk-crypto-js-0.1.0-alpha.2.tgz#a09d0fea858e817da971a3c9f904632ef7b49eb6"
   integrity sha512-oVkBCh9YP7H9i4gAoQbZzswniczfo/aIptNa4dxRi4Ff9lSvUCFv6Hvzi7C+90c0/PWZLXjIDTIAWZYmwyd2fA==
 
-"@matrix-org/matrix-wysiwyg@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-1.1.0.tgz#45d55265485fdfa8592682d84aa3300e9e69a5c9"
-  integrity sha512-cbQGj6RPWupJgrqxGdeaKomBU2rOhRljaGoN/cRzlvlgcIYWZks0E4ULqzZRDsBHchH+ccPfMziGKK8ScdjaZg==
+"@matrix-org/matrix-wysiwyg@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-1.1.1.tgz#a07b13097e72a9bae220a647527d6418c5423827"
+  integrity sha512-pp7poyd3vfC/P34ZRj6u2oyLJuex77egeSsIA1MPowBqtrIAmHkji9xviBdXPcDss2zEI4EZuX77JWXtAfaz7Q==
 
 "@matrix-org/olm@https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.14.tgz":
   version "3.2.14"