Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pref: create while searching for tags or categories #5526

Merged
merged 1 commit into from Mar 20, 2024
Merged

pref: create while searching for tags or categories #5526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 16 additions & 10 deletions ui/src/formkit/inputs/category-select/CategorySelect.vue
View file
Open in desktop
Expand Up @@ -171,19 +171,23 @@ const handleKeydown = (e: KeyboardEvent) => {
: convertTreeToCategories(categoriesTree.value);

const index = categoryIndices.findIndex(
(tag) => tag.metadata.name === selectedCategory.value?.metadata.name
(category) =>
category.metadata.name === selectedCategory.value?.metadata.name
);
if (index > 0) {
selectedCategory.value = categoryIndices[index - 1];
} else {
selectedCategory.value = undefined;
}
scrollToSelected();
}

if (e.key === "Enter") {
if (searchResults.value.length === 0 && text.value) {
if (!selectedCategory.value && text.value) {
handleCreateCategory();
return;
}

if (selectedCategory.value) {
handleSelect(selectedCategory.value);
text.value = "";
Expand All @@ -193,12 +197,10 @@ const handleKeydown = (e: KeyboardEvent) => {
};

const scrollToSelected = () => {
if (!selectedCategory.value) {
return;
}
const selectedNode = document.getElementById(
`category-${selectedCategory.value?.metadata.name}`
);
const selectedNodeName = selectedCategory.value
? selectedCategory.value?.metadata.name
: "create";
const selectedNode = document.getElementById(`category-${selectedNodeName}`);
if (selectedNode) {
selectedNode.scrollIntoView({
behavior: "smooth",
Expand Down Expand Up @@ -291,11 +293,15 @@ const handleDelete = () => {
<div v-if="dropdownVisible" :class="context.classes['dropdown-wrapper']">
<ul class="p-1">
<HasPermission
v-if="text.trim() && !searchResults?.length"
v-if="text.trim()"
:permissions="['system:posts:manage']"
>
<li
class="group flex cursor-pointer items-center justify-between rounded bg-gray-100 p-2"
id="category-create"
class="group flex cursor-pointer items-center justify-between rounded p-2"
:class="{
'bg-gray-100': selectedCategory === undefined,
}"
@click="handleCreateCategory"
>
<span class="text-xs text-gray-700 group-hover:text-gray-900">
Expand Down
22 changes: 13 additions & 9 deletions ui/src/formkit/inputs/tag-select/TagSelect.vue
View file
Open in desktop
Expand Up @@ -153,13 +153,15 @@ const handleKeydown = (e: KeyboardEvent) => {
);
if (index > 0) {
selectedTag.value = searchResults.value[index - 1];
} else {
selectedTag.value = undefined;
}

scrollToSelected();
}

if (e.key === "Enter") {
if (searchResults.value.length === 0 && text.value) {
if (!selectedTag.value && text.value) {
handleCreateTag();
return;
}
Expand All @@ -174,13 +176,11 @@ const handleKeydown = (e: KeyboardEvent) => {
};

const scrollToSelected = () => {
if (!selectedTag.value) {
return;
}
const selectedNodeName = selectedTag.value
? selectedTag.value?.metadata.name
: "tag-create";

const selectedNode = document.getElementById(
selectedTag.value?.metadata.name
);
const selectedNode = document.getElementById(selectedNodeName);

if (selectedNode) {
selectedNode.scrollIntoView({
Expand Down Expand Up @@ -281,11 +281,15 @@ const handleDelete = () => {
<div v-if="dropdownVisible" :class="context.classes['dropdown-wrapper']">
<ul class="p-1">
<HasPermission
v-if="text.trim() && !searchResults?.length"
v-if="text.trim()"
:permissions="['system:posts:manage']"
>
<li
class="group flex cursor-pointer items-center justify-between rounded bg-gray-100 p-2"
id="tag-create"
class="group flex cursor-pointer items-center justify-between rounded p-2"
:class="{
'bg-gray-100': selectedTag === undefined,
}"
@click="handleCreateTag"
>
<span class="text-xs text-gray-700 group-hover:text-gray-900">
Expand Down