Merge remote-tracking branch 'origin/main' into feature/103

frontend/src/components/PostFormTagsArea.tsx

@@ -25,8 +25,8 @@ const getTokenAt = (value: string, pos: number) => {
 }
 
 
-const replaceToken = (value: string, start: number, end: number, text: string) => (
+const replaceToken = (value: string, start: number, end: number, text: string) =>
-    `${ value.slice (0, start) }${ text }${ value.slice (end) }`)
+    `${ value.slice (0, start) }${ text }${ value.slice (end) }`
 
 
 type Props = {
@@ -44,10 +44,10 @@ export default (({ tags, setTags }: Props) => {
   const handleTagSelect = (tag: Tag) => {
     setSuggestionsVsbl (false)
     const textarea = ref.current!
-    const newValue = replaceToken (tags, bounds.start, bounds.end, tag.name)
+    const newValue = replaceToken (tags, bounds.start, bounds.end, tag.name + ' ')
     setTags (newValue)
     requestAnimationFrame (async () => {
-      const p = bounds.start + tag.name.length
+      const p = bounds.start + tag.name.length + 1
       textarea.selectionStart = textarea.selectionEnd = p
       textarea.focus ()
       await recompute (p, newValue)
@@ -56,8 +56,15 @@ export default (({ tags, setTags }: Props) => {
 
   const recompute = async (pos: number, v: string = tags) => {
     const { start, end, token } = getTokenAt (v, pos)
+    if (!(token.trim ()))
+      {
+	setSuggestionsVsbl (false)
+	return
+      }
+
     setBounds ({ start, end })
-    const data = await apiGet<Tag[]> ('/tags/autocomplete', { params: { q: token } })
+
+    const data = await apiGet<Tag[]> ('/tags/autocomplete', { params: { q: token, nico: '0' } })
     setSuggestions (data.filter (t => t.postCount > 0))
     setSuggestionsVsbl (suggestions.length > 0)
   }
@@ -72,8 +79,10 @@ export default (({ tags, setTags }: Props) => {
 	    onSelect={async (ev: SyntheticEvent<HTMLTextAreaElement>) => {
 	      const pos = (ev.target as HTMLTextAreaElement).selectionStart
 	      await recompute (pos)
-	    }}/>
+	    }}
-	<TagSearchBox suggestions={suggestionsVsbl && suggestions.length
+	    onBlur={() => setSuggestionsVsbl (false)}/>
+	<TagSearchBox
+	    suggestions={suggestionsVsbl && suggestions.length > 0
 			 ? suggestions
 			 : [] as Tag[]}
 	    activeIndex={-1}