v3.36.1

lekakid · Apr 29, 2024 · 390bd47 · 390bd47
2 parents b2476d0 + bdb94cf
commit 390bd47
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 24 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "arcarefresher",
-  "version": "3.36.0",
+  "version": "3.36.1",
   "description": "",
   "author": "LeKAKiD",
   "license": "MIT",

diff --git a/src/feature/Site/Mute/ContextMenu/View.jsx b/src/feature/Site/Mute/ContextMenu/View.jsx
@@ -76,7 +76,9 @@ function ContextMenu({ target, closeMenu }) {
 
           const userTmp = new ArcaUser(userElement);
           const uid = userTmp.toUID();
-          return { type: 'user', uid };
+          const regex = makeRegex(uid);
+
+          return { type: 'user', uid, regex };
         }
 
         if (target.matches(emotSelector)) {
@@ -252,9 +254,8 @@ function ContextMenu({ target, closeMenu }) {
   }, [closeMenu, data, dispatch, setSnack]);
 
   const handleUser = useCallback(() => {
-    const { uid } = data;
-    const regex = makeRegex(uid);
-    const exist = user.includes(uid);
+    const { regex } = data;
+    const exist = user.includes(regex);
 
     dispatch(exist ? $removeUser(regex) : $addUser(regex));
     closeMenu();
@@ -318,7 +319,7 @@ function ContextMenu({ target, closeMenu }) {
   }
 
   if (data?.type === 'user') {
-    const exist = user.includes(makeRegex(data.uid));
+    const exist = user.includes(data.regex);
     return (
       <List>
         <MenuItem onClick={handleUser}>

diff --git a/src/feature/Site/SiteCustom/ConfigMenu/View.jsx b/src/feature/Site/SiteCustom/ConfigMenu/View.jsx
@@ -26,6 +26,7 @@ import {
   $toggleSideContents,
   $toggleSideBests,
   $toggleSideNews,
+  $toggleFontSizeEnabled,
   $setFontSize,
   // 동작
   $setSpoofTitle,
@@ -50,6 +51,7 @@ const View = forwardRef((_props, ref) => {
     sideBests,
     sideNews,
     sideMenu,
+    fontSizeEnabled,
     fontSize,
     // 동작
     spoofTitle,
@@ -138,21 +140,29 @@ const View = forwardRef((_props, ref) => {
               </Collapse>
             </>
           )}
-          <SliderRow
-            divider
-            primary="사이트 전체 폰트 크기"
-            secondary="표시 설정에서 글자 크기 브라우저 기본 설정 필요"
-            sliderProps={{
-              min: 8,
-              max: 30,
-              step: 1,
-              valueLabelFormat: labelFormat,
-              valueLabelDisplay: 'auto',
-            }}
-            value={fontSize}
-            action={$setFontSize}
-            opacityOnChange={0.6}
+          <SwitchRow
+            divider={fontSizeEnabled}
+            primary="사이트 전체 폰트 크기 설정"
+            secondary="⚠ 사이트의 표시 설정을 무시합니다."
+            value={fontSizeEnabled}
+            action={$toggleFontSizeEnabled}
           />
+          <Collapse in={fontSizeEnabled}>
+            <SliderRow
+              divider
+              primary="폰트 크기"
+              sliderProps={{
+                min: 8,
+                max: 30,
+                step: 1,
+                valueLabelFormat: labelFormat,
+                valueLabelDisplay: 'auto',
+              }}
+              value={fontSize}
+              action={$setFontSize}
+              opacityOnChange={0.6}
+            />
+          </Collapse>
         </List>
       </Paper>
       <Typography variant="subtitle2">동작 설정</Typography>

diff --git a/src/feature/Site/SiteCustom/Feature.jsx b/src/feature/Site/SiteCustom/Feature.jsx
@@ -190,7 +190,9 @@ function FontSizeStyles({ value }) {
   return (
     <GlobalStyles
       styles={{
-        fontSize: value,
+        html: {
+          fontSize: `${value}px !important`,
+        },
       }}
     />
   );
@@ -237,6 +239,7 @@ export default function SiteCustom() {
     sideBests,
     sideNews,
     sideMenu,
+    fontSizeEnabled,
     fontSize,
     fixDarkModeWriteForm,
     // 동작
@@ -298,7 +301,7 @@ export default function SiteCustom() {
       <SideContentsStyles value={sideContents} />
       <SideBestsStyles value={sideBests} />
       <SideNewsStyles value={sideNews} />
-      <FontSizeStyles value={fontSize} />
+      {fontSizeEnabled && <FontSizeStyles value={fontSize} />}
       <FixDarkModeWriteFormStyles value={fixDarkModeWriteForm} />
     </>
   );

diff --git a/src/feature/Site/SiteCustom/slice.jsx b/src/feature/Site/SiteCustom/slice.jsx
@@ -22,6 +22,7 @@ const defaultStorage = {
   sideContents: true,
   sideBests: true,
   sideNews: true,
+  fontSizeEnabled: false,
   fontSize: 15,
   // 동작
   spoofTitle: '',
@@ -95,6 +96,9 @@ export const slice = createSlice({
     $toggleSideNews(state) {
       state.storage.sideNews = !state.storage.sideNews;
     },
+    $toggleFontSizeEnabled(state) {
+      state.storage.fontSizeEnabled = !state.storage.fontSizeEnabled;
+    },
     $setFontSize(state, action) {
       state.storage.fontSize = action.payload;
     },
@@ -122,6 +126,7 @@ export const {
   $toggleSideContents,
   $toggleSideBests,
   $toggleSideNews,
+  $toggleFontSizeEnabled,
   $setFontSize,
   // 동작
   $setSpoofTitle,