Open-source and local-first Slack and Notion alternative that puts you in control of your data
TypeScript chatchat-applicationcrdteditorelectronknowledge-baselocal-firstnotionnotion-alternativerealtime-collaborationself-hostedslacksqliteteam-collaborationwikiyjs
Improve avatar picker tabs
Hakan Shehu61c58f1f4104
diff --git a/apps/desktop/src/renderer/components/avatars/avatar-upload.tsx b/apps/desktop/src/renderer/components/avatars/avatar-upload.tsxindex 8599a33a..9eaf0f06 100644--- a/apps/desktop/src/renderer/components/avatars/avatar-upload.tsx+++ b/apps/desktop/src/renderer/components/avatars/avatar-upload.tsx@@ -21,7 +21,7 @@ export const AvatarUpload = ({ onUpload }: AvatarUploadProps) => {};return (- <div className="min-h-[280px] w-full min-w-[355px] p-1">+ <div className="h-[280px] min-h-[280px] w-[360px] min-w-[360px] p-1"><formclassName="mb-5 flex gap-x-2"onSubmit={async (e) => {diff --git a/apps/desktop/src/renderer/components/emojis/emoji-picker.tsx b/apps/desktop/src/renderer/components/emojis/emoji-picker.tsxindex a3463089..11a74077 100644--- a/apps/desktop/src/renderer/components/emojis/emoji-picker.tsx+++ b/apps/desktop/src/renderer/components/emojis/emoji-picker.tsx@@ -15,36 +15,38 @@ export const EmojiPicker = ({ onPick }: EmojiPickerProps) => {const [skinTone, setSkinTone] = React.useState(0);const { data, isPending } = useQuery({ type: 'emojis_get' });- if (isPending || !data) {- return null;- }-return (- <EmojiPickerContext.Provider- value={{ data, skinTone, onPick: (emoji) => onPick(emoji, skinTone) }}- >- <div className="flex flex-col gap-1 p-1">- <div className="flex flex-row items-center gap-1">- <input- type="text"- placeholder="Search..."- value={query}- onChange={(e) => setQuery(e.target.value)}- className="w-full rounded-md bg-gray-100 p-2 text-xs focus:outline-none"- />- <EmojiSkinToneSelector- skinTone={skinTone}- onSkinToneChange={setSkinTone}- />- </div>- <div className="h-full min-h-[280px] w-full overflow-auto md:w-[350px]">- {query.length > 2 ? (- <EmojiPickerSearch query={query} />- ) : (- <EmojiPickerBrowser />- )}- </div>+ <div className="flex flex-col gap-1 p-1">+ <div className="flex flex-row items-center gap-1">+ <input+ type="text"+ placeholder="Search..."+ value={query}+ onChange={(e) => setQuery(e.target.value)}+ className="w-full rounded-md bg-gray-100 p-2 text-xs focus:outline-none"+ />+ <EmojiSkinToneSelector+ skinTone={skinTone}+ onSkinToneChange={setSkinTone}+ />+ </div>+ <div className="h-[280px] min-h-[280px] overflow-auto w-[350px] min-w-[350px]">+ {!isPending && data && (+ <EmojiPickerContext.Provider+ value={{+ data,+ skinTone,+ onPick: (emoji) => onPick(emoji, skinTone),+ }}+ >+ {query.length > 2 ? (+ <EmojiPickerSearch query={query} />+ ) : (+ <EmojiPickerBrowser />+ )}+ </EmojiPickerContext.Provider>+ )}</div>- </EmojiPickerContext.Provider>+ </div>);};diff --git a/apps/desktop/src/renderer/components/icons/icon-picker.tsx b/apps/desktop/src/renderer/components/icons/icon-picker.tsxindex ae87dbe9..fdfd9858 100644--- a/apps/desktop/src/renderer/components/icons/icon-picker.tsx+++ b/apps/desktop/src/renderer/components/icons/icon-picker.tsx@@ -13,10 +13,6 @@ export const IconPicker = ({ onPick }: IconPickerProps) => {const [query, setQuery] = React.useState('');const { data, isPending } = useQuery({ type: 'icons_get' });- if (isPending || !data) {- return null;- }-return (<IconPickerContext.Provider value={{ data, onPick }}><div className="flex flex-col gap-1 p-1">@@ -27,11 +23,15 @@ export const IconPicker = ({ onPick }: IconPickerProps) => {onChange={(e) => setQuery(e.target.value)}className="w-full rounded-md bg-gray-100 p-2 text-xs focus:outline-none"/>- <div className="h-full min-h-[280px] w-full overflow-auto md:w-[350px]">- {query.length > 2 ? (- <IconPickerSearch query={query} />- ) : (- <IconPickerBrowser />+ <div className="h-[280px] min-h-[280px] overflow-auto w-[350px] min-w-[350px]">+ {!isPending && data && (+ <IconPickerContext.Provider value={{ data, onPick }}>+ {query.length > 2 ? (+ <IconPickerSearch query={query} />+ ) : (+ <IconPickerBrowser />+ )}+ </IconPickerContext.Provider>)}</div></div>diff --git a/apps/desktop/src/renderer/components/ui/tabs.tsx b/apps/desktop/src/renderer/components/ui/tabs.tsxindex bc530e49..4fceca63 100644--- a/apps/desktop/src/renderer/components/ui/tabs.tsx+++ b/apps/desktop/src/renderer/components/ui/tabs.tsx@@ -42,7 +42,7 @@ const TabsContent = React.forwardRef<<TabsPrimitive.Contentref={ref}className={cn(- 'mt-2 ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2',+ 'mt-2 ring-offset-background focus-visible:outline-none focus-visible:ring-0 focus-visible:ring-offset-0',className)}{...props}