chore: update trim in Autocomplete
This commit is contained in:
parent
acb71dfb69
commit
efc0dc9aea
3 changed files with 23 additions and 33 deletions
|
|
@ -135,7 +135,7 @@ const AddMemoRelationPopover = (props: Props) => {
|
||||||
</Button>
|
</Button>
|
||||||
</PopoverTrigger>
|
</PopoverTrigger>
|
||||||
<PopoverContent align="center">
|
<PopoverContent align="center">
|
||||||
<div className="w-[16rem] flex flex-col justify-start items-start">
|
<div className="w-[16rem] p-1 flex flex-col justify-start items-start">
|
||||||
<Autocomplete
|
<Autocomplete
|
||||||
className="w-full"
|
className="w-full"
|
||||||
size="md"
|
size="md"
|
||||||
|
|
@ -148,7 +148,7 @@ const AddMemoRelationPopover = (props: Props) => {
|
||||||
inputValue={searchText}
|
inputValue={searchText}
|
||||||
value={selectedMemos}
|
value={selectedMemos}
|
||||||
multiple
|
multiple
|
||||||
onInputChange={(_, value) => setSearchText(value.trim())}
|
onInputChange={(_, value) => setSearchText(value.trimStart())}
|
||||||
getOptionKey={(memo) => memo.name}
|
getOptionKey={(memo) => memo.name}
|
||||||
getOptionLabel={(memo) => memo.content}
|
getOptionLabel={(memo) => memo.content}
|
||||||
isOptionEqualToValue={(memo, value) => memo.name === value.name}
|
isOptionEqualToValue={(memo, value) => memo.name === value.name}
|
||||||
|
|
|
||||||
|
|
@ -105,7 +105,7 @@ const LocationSelector = (props: Props) => {
|
||||||
</Button>
|
</Button>
|
||||||
</PopoverTrigger>
|
</PopoverTrigger>
|
||||||
<PopoverContent align="center">
|
<PopoverContent align="center">
|
||||||
<div className="min-w-80 sm:w-lg flex flex-col justify-start items-start">
|
<div className="min-w-80 sm:w-lg p-1 flex flex-col justify-start items-start">
|
||||||
<LeafletMap key={JSON.stringify(state.initilized)} latlng={state.position} onChange={onPositionChanged} />
|
<LeafletMap key={JSON.stringify(state.initilized)} latlng={state.position} onChange={onPositionChanged} />
|
||||||
<div className="mt-2 w-full flex flex-row justify-between items-center gap-2">
|
<div className="mt-2 w-full flex flex-row justify-between items-center gap-2">
|
||||||
<div className="flex flex-row items-center justify-start gap-2">
|
<div className="flex flex-row items-center justify-start gap-2">
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,6 @@
|
||||||
import { Button } from "@usememos/mui";
|
import { Button } from "@usememos/mui";
|
||||||
import { HashIcon } from "lucide-react";
|
import { HashIcon } from "lucide-react";
|
||||||
import { observer } from "mobx-react-lite";
|
import { observer } from "mobx-react-lite";
|
||||||
import { useRef, useState } from "react";
|
|
||||||
import useClickAway from "react-use/lib/useClickAway";
|
|
||||||
import OverflowTip from "@/components/kit/OverflowTip";
|
import OverflowTip from "@/components/kit/OverflowTip";
|
||||||
import { userStore } from "@/store/v2";
|
import { userStore } from "@/store/v2";
|
||||||
import { useTranslate } from "@/utils/i18n";
|
import { useTranslate } from "@/utils/i18n";
|
||||||
|
|
@ -16,17 +14,11 @@ interface Props {
|
||||||
const TagSelector = observer((props: Props) => {
|
const TagSelector = observer((props: Props) => {
|
||||||
const t = useTranslate();
|
const t = useTranslate();
|
||||||
const { editorRef } = props;
|
const { editorRef } = props;
|
||||||
const [open, setOpen] = useState(false);
|
|
||||||
const containerRef = useRef<HTMLDivElement>(null);
|
|
||||||
const tags = Object.entries(userStore.state.tagCount)
|
const tags = Object.entries(userStore.state.tagCount)
|
||||||
.sort((a, b) => a[0].localeCompare(b[0]))
|
.sort((a, b) => a[0].localeCompare(b[0]))
|
||||||
.sort((a, b) => b[1] - a[1])
|
.sort((a, b) => b[1] - a[1])
|
||||||
.map(([tag]) => tag);
|
.map(([tag]) => tag);
|
||||||
|
|
||||||
useClickAway(containerRef, () => {
|
|
||||||
setOpen(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
const handleTagClick = (tag: string) => {
|
const handleTagClick = (tag: string) => {
|
||||||
const current = editorRef.current;
|
const current = editorRef.current;
|
||||||
if (current === null) return;
|
if (current === null) return;
|
||||||
|
|
@ -41,34 +33,32 @@ const TagSelector = observer((props: Props) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Popover open={open} onOpenChange={setOpen}>
|
<Popover>
|
||||||
<PopoverTrigger asChild>
|
<PopoverTrigger asChild>
|
||||||
<Button variant="plain" className="p-0">
|
<Button variant="plain" className="p-0">
|
||||||
<HashIcon className="w-5 h-5" />
|
<HashIcon className="w-5 h-5" />
|
||||||
</Button>
|
</Button>
|
||||||
</PopoverTrigger>
|
</PopoverTrigger>
|
||||||
<PopoverContent align="start" sideOffset={2}>
|
<PopoverContent align="start" sideOffset={2}>
|
||||||
<div ref={containerRef}>
|
{tags.length > 0 ? (
|
||||||
{tags.length > 0 ? (
|
<div className="flex flex-row justify-start items-start flex-wrap px-2 max-w-48 h-auto max-h-48 overflow-y-auto gap-x-2">
|
||||||
<div className="flex flex-row justify-start items-start flex-wrap px-3 py-1 max-w-48 h-auto max-h-48 overflow-y-auto gap-x-2 gap-y-1">
|
{tags.map((tag) => {
|
||||||
{tags.map((tag) => {
|
return (
|
||||||
return (
|
<div
|
||||||
<div
|
key={tag}
|
||||||
key={tag}
|
className="inline-flex w-auto max-w-full cursor-pointer text-base leading-6 text-gray-500 dark:text-gray-400 hover:opacity-80"
|
||||||
className="inline-flex w-auto max-w-full cursor-pointer text-base leading-6 text-gray-500 dark:text-gray-400 hover:text-primary dark:hover:text-primary-dark"
|
onClick={() => handleTagClick(tag)}
|
||||||
onClick={() => handleTagClick(tag)}
|
>
|
||||||
>
|
<OverflowTip>#{tag}</OverflowTip>
|
||||||
<OverflowTip>#{tag}</OverflowTip>
|
</div>
|
||||||
</div>
|
);
|
||||||
);
|
})}
|
||||||
})}
|
</div>
|
||||||
</div>
|
) : (
|
||||||
) : (
|
<p className="italic mx-2" onClick={(e) => e.stopPropagation()}>
|
||||||
<p className="italic mx-2" onClick={(e) => e.stopPropagation()}>
|
{t("tag.no-tag-found")}
|
||||||
{t("tag.no-tag-found")}
|
</p>
|
||||||
</p>
|
)}
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</PopoverContent>
|
</PopoverContent>
|
||||||
</Popover>
|
</Popover>
|
||||||
);
|
);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue