Merge branch 'master' into ink_v1

1 files changed, 3 insertions, 23 deletions

diff --git a/src/client/views/nodes/button/FontIconBox.tsx b/src/client/views/nodes/button/FontIconBox.tsx
index 14b1cbb5d..bd103dcf7 100644
--- a/src/client/views/nodes/button/FontIconBox.tsx
+++ b/src/client/views/nodes/button/FontIconBox.tsx
@@ -636,30 +636,10 @@ Scripting.addGlobal(function getActiveTextInfo(info: "family" | "size" | "color"
 Scripting.addGlobal(function setAlignment(align: "left" | "right" | "center", checkResult?: boolean) {
     const editorView = RichTextMenu.Instance?.TextView?.EditorView;
     if (checkResult) {
-        let active: string;
-        if (editorView) {
-            active = editorView?.state && RichTextMenu.Instance.getActiveAlignment();
-        } else {
-            active = StrCast(Doc.UserDoc().textAlign);
-        }
-        if (active === align) return Colors.MEDIUM_BLUE;
-        return "transparent";
+        return (editorView ? RichTextMenu.Instance.textAlign : Doc.UserDoc().textAlign) === align ? Colors.MEDIUM_BLUE : "transparent";
     }
-    SelectionManager.Docs().map(doc => doc.textAlign = align);
-    switch (align) {
-        case "left":
-            editorView?.state && RichTextMenu.Instance.alignLeft(editorView, editorView.dispatch);
-            break;
-        case "center":
-            editorView?.state && RichTextMenu.Instance.alignCenter(editorView, editorView.dispatch);
-            break;
-        case "right":
-            editorView?.state && RichTextMenu.Instance.alignRight(editorView, editorView.dispatch);
-            break;
-        default:
-            break;
-    }
-    Doc.UserDoc().textAlign = align;
+    if (editorView?.state) RichTextMenu.Instance.align(editorView, editorView.dispatch, align);
+    else Doc.UserDoc().textAlign = align;
 });
 
 Scripting.addGlobal(function setBulletList(mapStyle: "bullet" | "decimal", checkResult?: boolean) {