From 32c564c400babd6ffc83c12bb38f25a546bb5387 Mon Sep 17 00:00:00 2001 From: fuwaa Date: Wed, 3 Aug 2022 10:35:06 +0800 Subject: [PATCH] bugfix: grouping issue, setting issue --- src/components/options/Sidebar.tsx | 2 +- src/components/popup/QuickChange.tsx | 27 ++++++++++++++++++--------- src/methods/config/colorGroups.js | 6 ++++++ 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/src/components/options/Sidebar.tsx b/src/components/options/Sidebar.tsx index e97ad88..7b996fb 100644 --- a/src/components/options/Sidebar.tsx +++ b/src/components/options/Sidebar.tsx @@ -49,7 +49,7 @@ interface Props { } export default function Sidebar(props: Props) { - var { color, setColor, filteredList, setFilter, setting } = props; + var { color, setColor, setFilter, setting } = props; react.useLayoutEffect(() => { pintGetUpdate(settings.cg46_6e7681[0], setScaleGray); diff --git a/src/components/popup/QuickChange.tsx b/src/components/popup/QuickChange.tsx index c1e05ad..5c3290d 100644 --- a/src/components/popup/QuickChange.tsx +++ b/src/components/popup/QuickChange.tsx @@ -64,63 +64,71 @@ export default function QuickChange() { function paintGray() { updateSpecific(color, 0, 0, scales.gray); setScaleGray(color); + chrome.tabs.reload(); } const [scaleYellow, setScaleYellow] = react.useState(`${defaultValue}`); function paintYellow() { updateSpecific(color, 0, 0, scales.yellow); - setScaleGray(color); + setScaleYellow(color); + chrome.tabs.reload(); } const [scaleBlue, setScaleBlue] = react.useState(`${defaultValue}`); function paintBlue() { updateSpecific(color, 0, 0, scales.blue); - setScaleGray(color); + setScaleBlue(color); + chrome.tabs.reload(); } const [scaleGreen, setScaleGreen] = react.useState(`${defaultValue}`); function paintGreen() { updateSpecific(color, 0, 0, scales.green); - setScaleGray(color); + setScaleGreen(color); + chrome.tabs.reload(); } const [scaleRed, setScaleRed] = react.useState(`${defaultValue}`); function paintRed() { updateSpecific(color, 0, 0, scales.red); - setScaleGray(color); + setScaleRed(color); + chrome.tabs.reload(); } const [scalePurple, setScalePurple] = react.useState(`${defaultValue}`); function paintPurple() { updateSpecific(color, 0, 0, scales.purple); - setScaleGray(color); + setScalePurple(color); + chrome.tabs.reload(); } const [scalePink, setScalePink] = react.useState(`${defaultValue}`); function paintPink() { updateSpecific(color, 0, 0, scales.pink); - setScaleGray(color); + setScalePink(color); + chrome.tabs.reload(); } const [scaleCalendar, setScaleCalendar] = react.useState(`${defaultValue}`); function paintCalendar() { updateSpecific(color, 0, 0, scales.calendar); - setScaleGray(color); + setScaleCalendar(color); + chrome.tabs.reload(); } const [scaleText, setScaleText] = react.useState(`${defaultValue}`); function paintText() { updateMultiple(settings.cg106_ffffff, chroma(color).hex()); - setScaleGray(color); - quickScheme = scaleHelper.generateScheme(color, scheme, variation, 0.5); + setScaleText(color); + chrome.tabs.reload(); } function setDefault() { @@ -188,6 +196,7 @@ export default function QuickChange() { pintGetUpdate(settings.cg60_a371f7[0], setScalePurple); pintGetUpdate(settings.cg19_26a641[0], setScaleCalendar); pintGetUpdate(settings.cg106_ffffff[0], setScaleText); + chrome.tabs.reload(); } function updateColor(color: string) { diff --git a/src/methods/config/colorGroups.js b/src/methods/config/colorGroups.js index 5d8dd71..564e11d 100644 --- a/src/methods/config/colorGroups.js +++ b/src/methods/config/colorGroups.js @@ -813,6 +813,12 @@ export var cg106_ffffff = [ "__color_checks_line_dt_fm_text", "__color_fg_on_emphasis", "__color_scale_white", + "__color_primer_fg_disabled", + "__color_accent_fg", + "__color_fg_subtle", + "__color_fg_muted", + "__color_done_fg", + "__color_fg_default", ]; // color group: 106 | default color: #ffffff0c