Nicholai/jan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: quickask mixing color schema (#2979)

Browse Source
This commit is contained in:
Faisal Amir 2024-06-03 10:06:22 +07:00 committed by GitHub
parent 1ce15e6bc4
commit af240bfe75
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web/app/search/SelectedText.tsx
View File

@ -10,7 +10,6 @@ const SelectedText = ({ onCleared }: { onCleared?: () => void }) => {
const containerRef = useRef<HTMLDivElement>(null)
useEffect(() => {
if (window.core?.api?.quickAskSizeUpdated !== 'function') return
if (text.trim().length === 0) {
window.core?.api?.quickAskSizeUpdated(0)
} else {

34
web/app/search/layout.tsx
View File

@ -2,23 +2,55 @@
import { useEffect } from 'react'
import { AppConfiguration, getUserHomePath, joinPath } from '@janhq/core'
import { useSetAtom } from 'jotai'
import ClipboardListener from '@/containers/Providers/ClipboardListener'
import JotaiWrapper from '@/containers/Providers/Jotai'
import ThemeWrapper from '@/containers/Providers/Theme'
import { useLoadTheme } from '@/hooks/useLoadTheme'
import { setupCoreServices } from '@/services/coreService'
import Search from './page'
import { defaultJanDataFolderAtom } from '@/helpers/atoms/App.atom'
import { janDataFolderPathAtom } from '@/helpers/atoms/AppConfig.atom'
export default function RootLayout() {
const setJanDataFolderPath = useSetAtom(janDataFolderPathAtom)
const setJanDefaultDataFolder = useSetAtom(defaultJanDataFolderAtom)
useEffect(() => {
setupCoreServices()
}, [])
useEffect(() => {
window.core?.api
?.getAppConfigurations()
?.then((appConfig: AppConfiguration) => {
setJanDataFolderPath(appConfig.data_folder)
})
}, [setJanDataFolderPath])
useEffect(() => {
async function getDefaultJanDataFolder() {
const homePath = await getUserHomePath()
const defaultJanDataFolder = await joinPath([homePath, 'jan'])
setJanDefaultDataFolder(defaultJanDataFolder)
}
getDefaultJanDataFolder()
}, [setJanDefaultDataFolder])
useLoadTheme()
return (
<html lang="en" suppressHydrationWarning>
<body className="bg-[hsla(var(--app-bg))] font-sans antialiased">
<body className="font-sans antialiased">
<JotaiWrapper>
<ThemeWrapper>
<ClipboardListener>