fix: fix theme bug

nicepkg · Nov 25, 2024 · 2bdb68c · 2bdb68c
1 parent 9147a4e
commit 2bdb68c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 46 deletions.
diff --git a/src/webview/components/chat/editor/chat-editor.tsx b/src/webview/components/chat/editor/chat-editor.tsx
@@ -1,11 +1,4 @@
-import {
-  useEffect,
-  useId,
-  useImperativeHandle,
-  useState,
-  type FC,
-  type Ref
-} from 'react'
+import { useEffect, useId, useImperativeHandle, type FC, type Ref } from 'react'
 import { $generateHtmlFromNodes } from '@lexical/html'
 import { AutoFocusPlugin } from '@lexical/react/LexicalAutoFocusPlugin'
 import {
@@ -20,7 +13,6 @@ import { OnChangePlugin } from '@lexical/react/LexicalOnChangePlugin'
 import { RichTextPlugin } from '@lexical/react/LexicalRichTextPlugin'
 import { TabIndentationPlugin } from '@lexical/react/LexicalTabIndentationPlugin'
 import { useQueryClient } from '@tanstack/react-query'
-import { TypedText } from '@webview/components/ui/typed-text'
 import { MentionNode } from '@webview/lexical/nodes/mention-node'
 import {
   MentionPlugin,
@@ -111,6 +103,7 @@ const ChatEditorInner: FC<ChatEditorProps> = ({
   ref,
   className,
   contentEditableClassName,
+  // eslint-disable-next-line unused-imports/no-unused-vars
   placeholder,
   autoFocus,
   onComplete,
@@ -120,21 +113,6 @@ const ChatEditorInner: FC<ChatEditorProps> = ({
   ...otherProps
 }) => {
   const [editor] = useLexicalComposerContext()
-  const [isHovered, setIsHovered] = useState(false)
-  const [showPlaceholder, setShowPlaceholder] = useState(true)
-
-  const handleMouseOver = () => {
-    setIsHovered(true)
-  }
-
-  const handleMouseOut = () => {
-    setIsHovered(false)
-    setShowPlaceholder(true)
-  }
-
-  const handleClick = () => {
-    setShowPlaceholder(false)
-  }
 
   const insertSpaceAndAt = () => {
     editor.focus()
@@ -266,9 +244,6 @@ const ChatEditorInner: FC<ChatEditorProps> = ({
     <div
       className={cn('editor-container relative', className)}
       tabIndex={1}
-      onMouseOver={handleMouseOver}
-      onMouseOut={handleMouseOut}
-      onClick={handleClick}
       {...otherProps}
     >
       <RichTextPlugin
@@ -280,24 +255,7 @@ const ChatEditorInner: FC<ChatEditorProps> = ({
             )}
           />
         }
-        placeholder={
-          showPlaceholder ? (
-            <div className="editor-placeholder absolute pointer-events-none top-2 left-0 text-foreground/50">
-              <TypedText
-                strings={
-                  Array.isArray(placeholder) ? placeholder : [placeholder || '']
-                }
-                typeSpeed={40}
-                backSpeed={30}
-                backDelay={2000}
-                loop={Array.isArray(placeholder)}
-                showCursor={Array.isArray(placeholder)}
-                cursorChar=""
-                isPaused={isHovered}
-              />
-            </div>
-          ) : null
-        }
+        // placeholder={placeholder}
         ErrorBoundary={LexicalErrorBoundary}
       />
       <OnChangePlugin onChange={onChange!} />

diff --git a/src/webview/components/chat/editor/content-preview-popover.tsx b/src/webview/components/chat/editor/content-preview-popover.tsx
@@ -6,6 +6,7 @@ import {
   PopoverTrigger
 } from '@webview/components/ui/popover'
 import { SparklesText } from '@webview/components/ui/sparkles-text'
+import { useGlobalContext } from '@webview/contexts/global-context'
 import { useReadFile } from '@webview/hooks/api/use-read-file'
 import { useControllableState } from '@webview/hooks/use-controllable-state'
 import { getExtFromPath } from '@webview/utils/path'
@@ -44,6 +45,7 @@ export const ContentPreviewPopover: React.FC<ContentPreviewPopoverProps> = ({
     defaultProp: false,
     onChange: onOpenChange
   })
+  const { isDarkTheme } = useGlobalContext()
 
   const getFileType = (filePath: string) => {
     const ext = getExtFromPath(filePath)?.toLowerCase() || 'txt'
@@ -126,7 +128,7 @@ export const ContentPreviewPopover: React.FC<ContentPreviewPopoverProps> = ({
         return (
           <ShikiHighlighter
             language={getShikiLanguageFromPath(content.path)}
-            theme="dark-plus"
+            theme={isDarkTheme ? 'dark-plus' : 'light-plus'}
             addDefaultStyles={false}
           >
             {fileContent}