🐛 fix: CivitAI Helper and PromptEditor

kaalibro · kaalibro · commit c545f094b900 · 2024-01-17T00:38:06.000+06:00
CivitAI Helper buttons (#520) PromptEditor: revert to 8409d3c as #198 reappeared on 2a651f6 PromptEditor: add svg icons for buttons
diff --git a/javascript/main.js b/javascript/main.js
diff --git a/src/components/PromptEditor/TagList/index.tsx b/src/components/PromptEditor/TagList/index.tsx
@@ -79,11 +79,10 @@ const TagList = memo<TagListProps>(({ tags, setTags, type, setValue }) => {
   );
 
   useEffect(() => {
-    if (!addAutocompleteToArea || bind) return;
-    let retryTimes = 0;
-    let bindInterval: any;
     try {
-      bindInterval = setInterval(() => {
+      if (!addAutocompleteToArea || bind) return;
+      let retryTimes = 0;
+      const bindInterval = setInterval(() => {
         if (bind || retryTimes > 10) {
           const inputDom = document.querySelector(`#${id}`) as HTMLInputElement;
           if (inputDom) {
@@ -98,9 +97,6 @@ const TagList = memo<TagListProps>(({ tags, setTags, type, setValue }) => {
     } catch (error) {
       consola.error('🤯 [promptTagEditor]', error);
     }
-    return () => {
-      if (bindInterval) clearInterval(bindInterval);
-    };
   }, [bind]);
 
   return (
diff --git a/src/components/PromptEditor/index.tsx b/src/components/PromptEditor/index.tsx
@@ -1,16 +1,22 @@
 import isEqual from 'fast-deep-equal';
-import { memo } from 'react';
+import { memo, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
 import PromptPicker from '@/components/PromptEditor/PromptPicker';
+import replaceIcon from '@/scripts/replaceIcon';
 import { selectors, useAppStore } from '@/store';
 
 import Prompt from './Prompt';
 
 const PromptEditor = memo(() => {
   const setting = useAppStore(selectors.currentSetting, isEqual);
   const { t } = useTranslation();
+
+  useEffect(() => {
+    if (setting.svgIcon) replaceIcon();
+  }, []);
+
   return (
     <Flexbox gap={16}>
       {setting.promptEditor && (
diff --git a/src/scripts/civitaiHelperFix.ts b/src/scripts/civitaiHelperFix.ts
@@ -279,5 +279,5 @@ export default () => {
     }, 500);
   };
 
-  return helperFix;
+  return helperFix();
 };
