Skip to content

Add the possibility to reorder and limit elements in tags fields #653

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
giuscris merged 4 commits into from
Feb 16, 2025
Merged

Add the possibility to reorder and limit elements in tags fields #653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dfdba62
Avoid generic sortable styles
giuscris Feb 16, 2025
bbbebc8
Make tag input reorderable
giuscris Feb 16, 2025
71fac14
Fix `TagInputOptions` interface
giuscris Feb 16, 2025
8ff2f98
Add limit option to tag fields
giuscris Feb 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions formwork/fields/tags.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@
$value = array_filter($value, static fn($item): bool => Constraint::matchesRegex($item, $field->get('pattern')));
}

if ($field->has('limit') && count($value) > $field->get('limit')) {
throw new ValidationException(sprintf('Field "%s" of type "%s" has a limit of %d items', $field->name(), $field->type(), $field->get('limit')));
}

return array_values(array_filter($value));
},

Expand All @@ -42,5 +46,9 @@

return $options !== null ? Arr::from($options) : null;
},

'limit' => function ($field): ?int {
return $field->get('limit', null);
},
];
};
4 changes: 2 additions & 2 deletions panel/src/scss/components/_animations.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@
10%,
50%,
90% {
transform: translate3d(-10px, 0, 0);
transform: translate3d(-4px, 0, 0);
}

30%,
70% {
transform: translate3d(10px, 0, 0);
transform: translate3d(16px, 0, 0);
}
}

Expand Down
20 changes: 10 additions & 10 deletions panel/src/scss/components/_pages-tree.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,22 +158,22 @@
display: none;
}

.sortable-chosen .pages-tree-item-cell {
.pages-tree-item.sortable-chosen .pages-tree-item-cell {
background-color: transparent;
opacity: 0.5;
}

.sortable-chosen .pages-tree-children,
.sortable-fallback .pages-tree-children {
.pages-tree-item.sortable-chosen .pages-tree-children,
.pages-tree-item.sortable-fallback .pages-tree-children {
display: none !important;
}

.sortable-chosen .pages-tree-children-toggle .icon,
.sortable-fallback .pages-tree-children-toggle .icon {
.pages-tree-item.sortable-chosen .pages-tree-children-toggle .icon,
.pages-tree-item.sortable-fallback .pages-tree-children-toggle .icon {
transform: none !important;
}

.sortable-fallback .pages-tree-item-cell {
.pages-tree-item.sortable-fallback .pages-tree-item-cell {
opacity: 1;
}

Expand All @@ -185,14 +185,14 @@
transform: rotate(-180deg);
}

.is-dragging {
cursor: grab !important;
.pages-tree.is-dragging {
cursor: grabbing !important;
}

.is-dragging > .is-not-orderable * {
.pages-tree.is-dragging > .is-not-orderable * {
cursor: no-drop !important;
}

.is-dragging > .is-not-orderable .pages-tree-row:hover {
.pages-tree.is-dragging > .is-not-orderable .pages-tree-row:hover {
background-color: var(--color-danger-900);
}
10 changes: 9 additions & 1 deletion panel/src/scss/components/forms/_forms-tag.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,12 @@
border-radius: $border-radius;
margin-bottom: 0.25rem;
background-color: var(--color-base-700);
cursor: default;
font-size: $font-size-sm;
@include user-select-none;

&.sortable-chosen:not(.sortable-drag) {
background-color: var(--color-accent-900);
}
}

.form-input-tag .tag:first-child {
Expand Down Expand Up @@ -92,3 +95,8 @@
content: "\00d7";
font-weight: 600;
}

.form-input-tag.is-dragging,
.form-input-tag.is-dragging * {
cursor: grabbing !important;
}
Loading