From afd3f8504f5db812c0e9689729ec884c21683e2a Mon Sep 17 00:00:00 2001 From: crupest Date: Mon, 17 May 2021 20:42:06 +0800 Subject: feat: Change the color picker in operation dialog. --- FrontEnd/src/app/views/common/OperationDialog.tsx | 6 ++---- .../src/app/views/timeline-common/TimelinePropertyChangeDialog.tsx | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'FrontEnd/src') diff --git a/FrontEnd/src/app/views/common/OperationDialog.tsx b/FrontEnd/src/app/views/common/OperationDialog.tsx index 6a5228f9..40c14e9e 100644 --- a/FrontEnd/src/app/views/common/OperationDialog.tsx +++ b/FrontEnd/src/app/views/common/OperationDialog.tsx @@ -1,7 +1,7 @@ import React, { useState } from "react"; import { useTranslation } from "react-i18next"; import { Form, Button, Modal } from "react-bootstrap"; -import { ChromePicker } from "react-color"; +import { TwitterPicker } from "react-color"; import { convertI18nText, I18nText, UiLogicError } from "@/common"; @@ -63,7 +63,6 @@ export interface OperationDialogColorInput { type: "color"; label?: I18nText; initValue?: string | null; - disableAlpha?: boolean; canBeNull?: boolean; } @@ -336,10 +335,9 @@ const OperationDialog = < {convertI18nText(item.label, t)} )} {value !== null && ( - updateValue(index, result.hex)} - disableAlpha={item.disableAlpha} /> )} diff --git a/FrontEnd/src/app/views/timeline-common/TimelinePropertyChangeDialog.tsx b/FrontEnd/src/app/views/timeline-common/TimelinePropertyChangeDialog.tsx index f63b2b45..f38485eb 100644 --- a/FrontEnd/src/app/views/timeline-common/TimelinePropertyChangeDialog.tsx +++ b/FrontEnd/src/app/views/timeline-common/TimelinePropertyChangeDialog.tsx @@ -55,7 +55,6 @@ const TimelinePropertyChangeDialog: React.FC type: "color", label: "timeline.dialogChangeProperty.color", initValue: timeline.color ?? null, - disableAlpha: true, canBeNull: true, }, ] as const -- cgit v1.2.3