From 3c79bae1848261e5e804558d6b2b419465fe079f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Dec 2021 05:16:07 +0000
Subject: build(deps-dev): Bump prettier from 2.4.1 to 2.5.1 in /FrontEnd

Bumps [prettier](https://github.com/prettier/prettier) from 2.4.1 to 2.5.1.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.4.1...2.5.1)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 FrontEnd/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FrontEnd')

diff --git a/FrontEnd/package.json b/FrontEnd/package.json
index f43413d0..7be0e20a 100644
--- a/FrontEnd/package.json
+++ b/FrontEnd/package.json
@@ -64,7 +64,7 @@
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-react": "^7.27.1",
     "eslint-plugin-react-hooks": "^4.3.0",
-    "prettier": "^2.4.1",
+    "prettier": "^2.5.1",
     "typescript": "^4.5.2",
     "vite": "^2.7.1",
     "vite-plugin-pwa": "^0.11.10"
-- 
cgit v1.2.3


From 7cb4b7578ac924ac552da2fb81941ee5d6ef9e8a Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Wed, 8 Dec 2021 22:35:39 +0800
Subject: ...

---
 .../TimelinePropertyChangeDialog.tsx               | 117 +++++++++++----------
 1 file changed, 59 insertions(+), 58 deletions(-)

(limited to 'FrontEnd')

diff --git a/FrontEnd/src/views/timeline-common/TimelinePropertyChangeDialog.tsx b/FrontEnd/src/views/timeline-common/TimelinePropertyChangeDialog.tsx
index 64daa19b..cd5c46da 100644
--- a/FrontEnd/src/views/timeline-common/TimelinePropertyChangeDialog.tsx
+++ b/FrontEnd/src/views/timeline-common/TimelinePropertyChangeDialog.tsx
@@ -23,65 +23,66 @@ const labelMap: { [key in TimelineVisibility]: string } = {
   Register: "timeline.visibility.register",
 };
 
-const TimelinePropertyChangeDialog: React.FC<TimelinePropertyChangeDialogProps> =
-  (props) => {
-    const { timeline, onChange } = props;
+const TimelinePropertyChangeDialog: React.FC<
+  TimelinePropertyChangeDialogProps
+> = (props) => {
+  const { timeline, onChange } = props;
 
-    return (
-      <OperationDialog
-        title={"timeline.dialogChangeProperty.title"}
-        inputScheme={
-          [
-            {
-              type: "text",
-              label: "timeline.dialogChangeProperty.titleField",
-              initValue: timeline.title,
-            },
-            {
-              type: "select",
-              label: "timeline.dialogChangeProperty.visibility",
-              options: kTimelineVisibilities.map((v) => ({
-                label: labelMap[v],
-                value: v,
-              })),
-              initValue: timeline.visibility,
-            },
-            {
-              type: "text",
-              label: "timeline.dialogChangeProperty.description",
-              initValue: timeline.description,
-            },
-            {
-              type: "color",
-              label: "timeline.dialogChangeProperty.color",
-              initValue: timeline.color ?? null,
-              canBeNull: true,
-            },
-          ] as const
+  return (
+    <OperationDialog
+      title={"timeline.dialogChangeProperty.title"}
+      inputScheme={
+        [
+          {
+            type: "text",
+            label: "timeline.dialogChangeProperty.titleField",
+            initValue: timeline.title,
+          },
+          {
+            type: "select",
+            label: "timeline.dialogChangeProperty.visibility",
+            options: kTimelineVisibilities.map((v) => ({
+              label: labelMap[v],
+              value: v,
+            })),
+            initValue: timeline.visibility,
+          },
+          {
+            type: "text",
+            label: "timeline.dialogChangeProperty.description",
+            initValue: timeline.description,
+          },
+          {
+            type: "color",
+            label: "timeline.dialogChangeProperty.color",
+            initValue: timeline.color ?? null,
+            canBeNull: true,
+          },
+        ] as const
+      }
+      open={props.open}
+      onClose={props.close}
+      onProcess={([newTitle, newVisibility, newDescription, newColor]) => {
+        const req: HttpTimelinePatchRequest = {};
+        if (newTitle !== timeline.title) {
+          req.title = newTitle;
         }
-        open={props.open}
-        onClose={props.close}
-        onProcess={([newTitle, newVisibility, newDescription, newColor]) => {
-          const req: HttpTimelinePatchRequest = {};
-          if (newTitle !== timeline.title) {
-            req.title = newTitle;
-          }
-          if (newVisibility !== timeline.visibility) {
-            req.visibility = newVisibility as TimelineVisibility;
-          }
-          if (newDescription !== timeline.description) {
-            req.description = newDescription;
-          }
-          const nc = newColor ?? "";
-          if (nc !== timeline.color) {
-            req.color = nc;
-          }
-          return getHttpTimelineClient()
-            .patchTimeline(timeline.name, req)
-            .then(onChange);
-        }}
-      />
-    );
-  };
+        if (newVisibility !== timeline.visibility) {
+          req.visibility = newVisibility as TimelineVisibility;
+        }
+        if (newDescription !== timeline.description) {
+          req.description = newDescription;
+        }
+        const nc = newColor ?? "";
+        if (nc !== timeline.color) {
+          req.color = nc;
+        }
+        return getHttpTimelineClient()
+          .patchTimeline(timeline.name, req)
+          .then(onChange);
+      }}
+    />
+  );
+};
 
 export default TimelinePropertyChangeDialog;
-- 
cgit v1.2.3