mirror of
https://github.com/willmiao/ComfyUI-Lora-Manager.git
synced 2026-09-21 03:01:27 -03:00
Will Miao
01137eed88
Model tags could already be reordered by dragging a chip, but the only hint was a `cursor: grab` on `.metadata-item` — a hover-only, mouse-only signal that also leaked into the bulk add-tags modal, where the chips are not sortable at all. Trigger words could not be reordered, and their order matters: "Copy Trigger Words" and the insert-into-node action join the array as-is to build a prompt. Both editors now share one vocabulary: a `⠿` grip that appears whenever the list has something to order, plus `Alt + arrow` keyboard moves with an aria-live announcement. Whether the chip body is draggable is a property of the item rather than of the feature: - tags have no click action of their own, so the whole chip stays draggable (`handleSelector: null`), with a 5px threshold so a click on the grip only focuses it - trigger words keep click-to-edit on the body, so a drag starts from the grip only - the grip is the element that opts out of touch scrolling (`touch-action: none`), so touch users drag by the grip in both editors - reordering is offered only while editing: trigger words reveal the grip from `.edit-mode`, tags from the edit container, which stays hidden outside edit mode The drag engine moves out of ModelTags.js into shared/pointerSort.js, which now marks sortable containers with `pointer-sort-enabled` so only lists that really sort show the grab cursor. Labels, the sortable flag, the keyboard handler and the live region live in shared/reorderSupport.js, and both editors render the same three `common.reorder.*` keys (translations follow in the next commit). Two inherited engine bugs are fixed on the way: the drop position was only settled when an animation frame was still pending, so a fast drag (or one that started by crossing the threshold) fell back into its original slot; and the guard that stops a drop from triggering the chip's own click handler was removed on a timer, swallowing unrelated clicks until the next task.
466 lines
9.6 KiB
CSS
466 lines
9.6 KiB
CSS
/* Common Metadata Edit UI Components */
|
|
/* Used by both tag editing and trigger words editing interfaces */
|
|
|
|
/* Edit Button */
|
|
.metadata-edit-btn {
|
|
background: transparent;
|
|
border: none;
|
|
color: var(--text-color);
|
|
opacity: 0.5;
|
|
cursor: pointer;
|
|
padding: 2px 5px;
|
|
border-radius: var(--border-radius-xs);
|
|
transition: var(--transition-base);
|
|
}
|
|
|
|
.metadata-edit-btn:hover {
|
|
opacity: 0.8;
|
|
background: rgba(0, 0, 0, 0.05);
|
|
}
|
|
|
|
[data-theme="dark"] .metadata-edit-btn:hover {
|
|
background: rgba(255, 255, 255, 0.05);
|
|
}
|
|
|
|
/* Edit mode active state */
|
|
.edit-mode .metadata-edit-btn {
|
|
opacity: 0.8;
|
|
color: var(--lora-accent);
|
|
}
|
|
|
|
/* Edit Container */
|
|
.metadata-edit-container {
|
|
padding: var(--space-2);
|
|
background: var(--surface-hover);
|
|
border: 1px solid rgba(0, 0, 0, 0.1);
|
|
border-radius: var(--border-radius-sm);
|
|
margin-top: var(--space-2);
|
|
width: 100%;
|
|
box-sizing: border-box;
|
|
position: relative;
|
|
display: block;
|
|
}
|
|
|
|
[data-theme="dark"] .metadata-edit-container {
|
|
background: var(--surface-hover);
|
|
border: 1px solid var(--lora-border);
|
|
}
|
|
|
|
/* Edit Header */
|
|
.metadata-edit-header {
|
|
display: flex;
|
|
justify-content: space-between;
|
|
align-items: center;
|
|
margin-bottom: 10px;
|
|
padding-bottom: 8px;
|
|
border-bottom: 1px solid var(--lora-border);
|
|
width: 100%;
|
|
}
|
|
|
|
/* Style for the edit button when positioned in the header */
|
|
.metadata-header-btn {
|
|
display: inline-flex !important;
|
|
opacity: 0.8 !important;
|
|
color: var(--lora-accent) !important;
|
|
margin-left: auto;
|
|
}
|
|
|
|
/* Edit Content */
|
|
.metadata-edit-content {
|
|
margin-bottom: var(--space-1);
|
|
width: 100%;
|
|
display: block;
|
|
}
|
|
|
|
/* Items Container */
|
|
.metadata-items {
|
|
display: flex;
|
|
flex-wrap: wrap;
|
|
gap: 8px;
|
|
align-items: flex-start;
|
|
margin-bottom: var(--space-2);
|
|
width: 100%;
|
|
min-height: 30px; /* Ensure some height even if empty to prevent layout shifts */
|
|
}
|
|
|
|
/* Individual Item */
|
|
.metadata-item {
|
|
display: inline-flex;
|
|
align-items: center;
|
|
background: var(--bg-color);
|
|
border: 1px solid var(--border-color);
|
|
border-radius: var(--border-radius-xs);
|
|
padding: 4px 8px;
|
|
position: relative;
|
|
transition: transform 0.18s ease;
|
|
}
|
|
|
|
/* --- Shared chip reordering (tags + trigger words) ------------------------ */
|
|
/* Chips in a list that is actually sortable advertise the grab gesture only
|
|
then, so lists that cannot be reordered never lie about it. */
|
|
|
|
.metadata-items.pointer-sort-enabled .metadata-item {
|
|
cursor: grab;
|
|
}
|
|
|
|
.metadata-items.pointer-sort-enabled .metadata-item:active {
|
|
cursor: grabbing;
|
|
}
|
|
|
|
/* Grip handle: always in the DOM, revealed when the list is sortable */
|
|
.reorder-handle {
|
|
display: none;
|
|
align-items: center;
|
|
justify-content: center;
|
|
flex-shrink: 0;
|
|
padding: 0;
|
|
margin-left: -2px;
|
|
border: none;
|
|
background: transparent;
|
|
color: var(--text-color);
|
|
opacity: 0.4;
|
|
font-size: 0.8em;
|
|
line-height: 1;
|
|
cursor: grab;
|
|
/* Keep a touch drag on the handle from scrolling the surrounding panel */
|
|
touch-action: none;
|
|
transition: opacity 0.2s ease, color 0.2s ease;
|
|
}
|
|
|
|
.has-sortable-words .reorder-handle {
|
|
display: inline-flex;
|
|
}
|
|
|
|
/* Tag chips have no flex gap (unlike trigger word tags), so the grip needs its
|
|
own spacing before the tag text */
|
|
.metadata-item .reorder-handle {
|
|
margin-right: 4px;
|
|
}
|
|
|
|
.reorder-handle:hover,
|
|
.reorder-handle:focus-visible {
|
|
opacity: 0.9;
|
|
color: var(--lora-accent);
|
|
}
|
|
|
|
.reorder-handle:focus-visible {
|
|
outline: 2px solid var(--lora-accent);
|
|
outline-offset: 1px;
|
|
border-radius: 2px;
|
|
}
|
|
|
|
.reorder-handle:active {
|
|
cursor: grabbing;
|
|
}
|
|
|
|
/* Hint shown in the edit controls row while reordering is available */
|
|
.reorder-hint {
|
|
display: none;
|
|
align-items: center;
|
|
gap: 4px;
|
|
margin-right: auto;
|
|
font-size: 0.75em;
|
|
color: var(--text-color);
|
|
opacity: 0.6;
|
|
white-space: nowrap;
|
|
}
|
|
|
|
.has-sortable-words .reorder-hint {
|
|
display: inline-flex;
|
|
}
|
|
|
|
/* Snapped-to-grid transition for the remaining chips while dragging */
|
|
.reorder-sorting > * {
|
|
transition: transform 0.18s ease;
|
|
}
|
|
|
|
/* The lifted chip that follows the pointer */
|
|
.reorder-dragging {
|
|
box-shadow: var(--shadow-dialog);
|
|
cursor: grabbing;
|
|
opacity: 0.95;
|
|
transition: none;
|
|
}
|
|
|
|
/* Drop target left behind by the lifted chip */
|
|
.reorder-placeholder {
|
|
border: 1px dashed var(--lora-accent);
|
|
border-radius: var(--border-radius-xs);
|
|
background: rgba(255, 255, 255, 0.1);
|
|
pointer-events: none;
|
|
}
|
|
|
|
body.reorder-drag-active {
|
|
user-select: none;
|
|
cursor: grabbing;
|
|
}
|
|
|
|
body.reorder-drag-active * {
|
|
cursor: grabbing !important;
|
|
}
|
|
|
|
/* Screen-reader-only live region announcing reorder moves */
|
|
.reorder-sr-only {
|
|
position: absolute;
|
|
width: 1px;
|
|
height: 1px;
|
|
padding: 0;
|
|
margin: -1px;
|
|
overflow: hidden;
|
|
clip: rect(0, 0, 0, 0);
|
|
white-space: nowrap;
|
|
border: 0;
|
|
}
|
|
|
|
.metadata-item-content {
|
|
color: var(--lora-accent) !important;
|
|
font-size: 0.85em;
|
|
line-height: 1.4;
|
|
word-break: break-word;
|
|
}
|
|
|
|
/* Delete Button */
|
|
.metadata-delete-btn {
|
|
position: absolute;
|
|
top: -5px;
|
|
right: -5px;
|
|
width: 16px;
|
|
height: 16px;
|
|
background: var(--lora-error);
|
|
color: white;
|
|
border: none;
|
|
border-radius: 50%;
|
|
cursor: pointer;
|
|
padding: 0;
|
|
display: flex;
|
|
align-items: center;
|
|
justify-content: center;
|
|
font-size: 9px;
|
|
transition: transform 0.2s ease;
|
|
}
|
|
|
|
.metadata-delete-btn:hover {
|
|
transform: scale(1.1);
|
|
}
|
|
|
|
/* Edit Controls */
|
|
.metadata-edit-controls {
|
|
display: flex;
|
|
justify-content: flex-end;
|
|
gap: var(--space-2);
|
|
margin-top: var(--space-2);
|
|
margin-bottom: var(--space-2);
|
|
}
|
|
|
|
.metadata-edit-controls button {
|
|
padding: 3px 8px;
|
|
border-radius: var(--border-radius-xs);
|
|
border: 1px solid var(--border-color);
|
|
background: var(--bg-color);
|
|
color: var(--text-color);
|
|
font-size: 0.85em;
|
|
cursor: pointer;
|
|
display: flex;
|
|
align-items: center;
|
|
gap: 4px;
|
|
transition: var(--transition-base);
|
|
}
|
|
|
|
.metadata-edit-controls button:hover {
|
|
background: oklch(var(--lora-accent-l) var(--lora-accent-c) var(--lora-accent-h) / 0.1);
|
|
border-color: var(--lora-accent);
|
|
}
|
|
|
|
.metadata-save-btn,
|
|
.save-tags-btn,
|
|
.append-tags-btn,
|
|
.replace-tags-btn {
|
|
background: var(--lora-accent) !important;
|
|
color: white !important;
|
|
border-color: var(--lora-accent) !important;
|
|
}
|
|
|
|
.metadata-save-btn:hover,
|
|
.save-tags-btn:hover,
|
|
.append-tags-btn:hover,
|
|
.replace-tags-btn:hover {
|
|
opacity: 0.9;
|
|
}
|
|
|
|
/* Specific styling for bulk tag action buttons */
|
|
.bulk-append-tags-btn {
|
|
background: var(--lora-accent) !important;
|
|
color: white !important;
|
|
border-color: var(--lora-accent) !important;
|
|
}
|
|
|
|
.bulk-replace-tags-btn {
|
|
background: var(--lora-warning, #f59e0b) !important;
|
|
color: white !important;
|
|
border-color: var(--lora-warning, #f59e0b) !important;
|
|
}
|
|
|
|
.bulk-append-tags-btn:hover {
|
|
opacity: 0.9;
|
|
}
|
|
|
|
.bulk-replace-tags-btn:hover {
|
|
background: var(--lora-warning-dark, #d97706) !important;
|
|
}
|
|
|
|
/* Add Form */
|
|
.metadata-add-form {
|
|
display: flex;
|
|
gap: var(--space-1);
|
|
position: relative;
|
|
width: 100%;
|
|
}
|
|
|
|
.metadata-input {
|
|
flex: 1;
|
|
padding: 4px 8px;
|
|
border-radius: var(--border-radius-xs);
|
|
border: 1px solid var(--border-color);
|
|
background: var(--bg-color);
|
|
color: var(--text-color);
|
|
font-size: 0.9em;
|
|
}
|
|
|
|
.metadata-input:focus {
|
|
border-color: var(--lora-accent);
|
|
outline: none;
|
|
}
|
|
|
|
/* Suggestions Dropdown */
|
|
.metadata-suggestions-dropdown {
|
|
position: absolute;
|
|
top: 100%;
|
|
left: 0;
|
|
right: 0;
|
|
background: var(--bg-color);
|
|
border: 1px solid var(--border-color);
|
|
border-radius: var(--border-radius-sm);
|
|
margin-top: 4px;
|
|
z-index: 100;
|
|
box-shadow: var(--shadow-elevated);
|
|
overflow: hidden;
|
|
display: flex;
|
|
flex-direction: column;
|
|
}
|
|
|
|
.metadata-suggestions-header {
|
|
display: flex;
|
|
justify-content: space-between;
|
|
align-items: center;
|
|
padding: 8px 12px;
|
|
background: var(--card-bg);
|
|
border-bottom: 1px solid var(--border-color);
|
|
}
|
|
|
|
.metadata-suggestions-header span {
|
|
font-size: 0.9em;
|
|
font-weight: 500;
|
|
color: var(--text-color);
|
|
}
|
|
|
|
.metadata-suggestions-header small {
|
|
font-size: 0.8em;
|
|
opacity: 0.7;
|
|
}
|
|
|
|
.metadata-suggestions-container {
|
|
max-height: 200px;
|
|
overflow-y: auto;
|
|
padding: 10px;
|
|
display: flex;
|
|
flex-wrap: wrap;
|
|
gap: 8px;
|
|
align-content: flex-start;
|
|
}
|
|
|
|
.metadata-suggestion-item {
|
|
display: inline-flex;
|
|
align-items: center;
|
|
justify-content: space-between;
|
|
padding: 5px 10px;
|
|
cursor: pointer;
|
|
transition: var(--transition-base);
|
|
border-radius: var(--border-radius-xs);
|
|
background: var(--lora-surface);
|
|
border: 1px solid var(--lora-border);
|
|
max-width: 150px;
|
|
}
|
|
|
|
.metadata-suggestion-item:hover {
|
|
background: oklch(var(--lora-accent-l) var(--lora-accent-c) var(--lora-accent-h) / 0.1);
|
|
border-color: var(--lora-accent);
|
|
}
|
|
|
|
.metadata-suggestion-item.already-added {
|
|
opacity: 0.7;
|
|
cursor: default;
|
|
}
|
|
|
|
.metadata-suggestion-item.already-added:hover {
|
|
background: var(--lora-surface);
|
|
border-color: var(--lora-border);
|
|
}
|
|
|
|
.metadata-suggestion-text {
|
|
color: var(--lora-accent) !important;
|
|
font-size: 0.9em;
|
|
white-space: nowrap;
|
|
overflow: hidden;
|
|
text-overflow: ellipsis;
|
|
margin-right: 4px;
|
|
max-width: 100px;
|
|
}
|
|
|
|
.metadata-suggestion-meta {
|
|
display: flex;
|
|
align-items: center;
|
|
gap: 4px;
|
|
flex-shrink: 0;
|
|
}
|
|
|
|
.added-indicator {
|
|
color: var(--lora-accent);
|
|
display: flex;
|
|
align-items: center;
|
|
justify-content: center;
|
|
font-size: 0.75em;
|
|
}
|
|
|
|
/* No suggestions message */
|
|
.no-suggestions {
|
|
padding: 16px 12px;
|
|
text-align: center;
|
|
color: var(--text-color);
|
|
opacity: 0.7;
|
|
font-style: italic;
|
|
font-size: 0.9em;
|
|
}
|
|
|
|
/* Loading indicator */
|
|
.metadata-loading {
|
|
display: flex;
|
|
align-items: center;
|
|
justify-content: center;
|
|
margin: var(--space-1) 0;
|
|
color: var(--text-color);
|
|
opacity: 0.7;
|
|
font-size: 0.9em;
|
|
gap: 8px;
|
|
}
|
|
|
|
.metadata-loading i {
|
|
color: var(--lora-accent);
|
|
}
|
|
|
|
/* Dropdown separator */
|
|
.dropdown-separator {
|
|
height: 1px;
|
|
background: var(--lora-border);
|
|
margin: 5px 10px;
|
|
}
|