Skip to content

⭐️⭐️⭐️ Open-source, self-hosted alternative to Linear and Plane. Project management and issue tracking where teams and AI agents work side by side to plan and ship products.

improvement(web): redesign the Display popover with animated icons (#703)

Croff79f7802af892
diff --git a/apps/web/messages/ar/display.json b/apps/web/messages/ar/display.json
index 5388a775..62bf3cfd 100644
--- a/apps/web/messages/ar/display.json
+++ b/apps/web/messages/ar/display.json
@@ -75,21 +75,29 @@
"ordering": "الترتيب",
"ascending": "تصاعدي",
"descending": "تنازلي",
- "showEmptyColumns": "إظهار الأعمدة الفارغة",
- "showEmptyGroups": "إظهار المجموعات الفارغة",
- "showLinks": "إظهار الروابط",
- "separateSubtaskCards": "إظهار المهام الفرعية كبطاقات منفصلة",
- "separateSubtaskRows": "إظهار المهام الفرعية كصفوف منفصلة",
- "startSubtasksCollapsed": "البدء بمهام فرعية مطوية",
- "showNestedSubtasks": "إظهار المهام الفرعية المتداخلة",
- "nestedSubtasks": "المهام الفرعية المتداخلة",
- "displayProperties": "خصائص العرض",
+ "emptyColumns": "الأعمدة الفارغة",
+ "emptyGroups": "المجموعات الفارغة",
+ "links": "الروابط",
+ "separateCards": "كبطاقات منفصلة",
+ "separateRows": "كصفوف منفصلة",
+ "nestedInCard": "داخل البطاقة الأم",
+ "nestedInRow": "داخل الصف الأم",
+ "subtasksCollapsed": "البدء مطوية",
+ "groupsCollapsed": "البدء بمجموعات مطوية",
"placeBy": "الترتيب حسب",
- "startWeekOn": "بداية الأسبوع",
- "startCollapsed": "البدء بمجموعات مطوية",
+ "weekStartsOn": "بداية الأسبوع",
"scale": "المقياس",
- "addCustomField": "إضافة حقل مخصّص",
+ "dragToReorder": "اسحب لإعادة الترتيب",
+ "customField": "حقل مخصّص",
"viewIcon": "أيقونة العرض"
},
+ "sections": {
+ "board": "اللوحة",
+ "rows": "الصفوف",
+ "show": "إظهار",
+ "subtasks": "المهام الفرعية",
+ "cardProperties": "خصائص البطاقة",
+ "columns": "الأعمدة"
+ },
"layoutCommand": "تخطيط {layout}"
}
diff --git a/apps/web/messages/en/display.json b/apps/web/messages/en/display.json
index d6bc022e..7e26d41a 100644
--- a/apps/web/messages/en/display.json
+++ b/apps/web/messages/en/display.json
@@ -75,21 +75,29 @@
"ordering": "Ordering",
"ascending": "Ascending",
"descending": "Descending",
- "showEmptyColumns": "Show empty columns",
- "showEmptyGroups": "Show empty groups",
- "showLinks": "Show links",
- "separateSubtaskCards": "Show subtasks as separate cards",
- "separateSubtaskRows": "Show subtasks as separate rows",
- "startSubtasksCollapsed": "Start with subtasks collapsed",
- "showNestedSubtasks": "Show nested subtasks",
- "nestedSubtasks": "Nested subtasks",
- "displayProperties": "Display properties",
+ "emptyColumns": "Empty columns",
+ "emptyGroups": "Empty groups",
+ "links": "Links",
+ "separateCards": "As separate cards",
+ "separateRows": "As separate rows",
+ "nestedInCard": "Inside parent card",
+ "nestedInRow": "Inside parent row",
+ "subtasksCollapsed": "Start collapsed",
+ "groupsCollapsed": "Groups start collapsed",
"placeBy": "Place by",
- "startWeekOn": "Start week on",
- "startCollapsed": "Start with groups collapsed",
+ "weekStartsOn": "Week starts on",
"scale": "Scale",
- "addCustomField": "Add custom field",
+ "dragToReorder": "Drag to reorder",
+ "customField": "Custom field",
"viewIcon": "View icon"
},
+ "sections": {
+ "board": "Board",
+ "rows": "Rows",
+ "show": "Show",
+ "subtasks": "Subtasks",
+ "cardProperties": "Card properties",
+ "columns": "Columns"
+ },
"layoutCommand": "{layout} layout"
}
diff --git a/apps/web/messages/es-ES/display.json b/apps/web/messages/es-ES/display.json
index f63feafd..a05ee328 100644
--- a/apps/web/messages/es-ES/display.json
+++ b/apps/web/messages/es-ES/display.json
@@ -75,21 +75,29 @@
"ordering": "Orden",
"ascending": "Ascendente",
"descending": "Descendente",
- "showEmptyColumns": "Mostrar columnas vacías",
- "showEmptyGroups": "Mostrar grupos vacíos",
- "showLinks": "Mostrar enlaces",
- "separateSubtaskCards": "Mostrar subtareas como tarjetas separadas",
- "separateSubtaskRows": "Mostrar subtareas como filas separadas",
- "startSubtasksCollapsed": "Empezar con las subtareas contraídas",
- "showNestedSubtasks": "Mostrar subtareas anidadas",
- "nestedSubtasks": "Subtareas anidadas",
- "displayProperties": "Propiedades visuales",
+ "emptyColumns": "Columnas vacías",
+ "emptyGroups": "Grupos vacíos",
+ "links": "Enlaces",
+ "separateCards": "Como tarjetas separadas",
+ "separateRows": "Como filas separadas",
+ "nestedInCard": "Dentro de la tarjeta padre",
+ "nestedInRow": "Dentro de la fila padre",
+ "subtasksCollapsed": "Empezar contraídas",
+ "groupsCollapsed": "Grupos contraídos al inicio",
"placeBy": "Situar por",
- "startWeekOn": "La semana empieza en",
- "startCollapsed": "Empezar con los grupos contraídos",
+ "weekStartsOn": "La semana empieza el",
"scale": "Escala",
- "addCustomField": "Añadir campo personalizado",
+ "dragToReorder": "Arrastra para reordenar",
+ "customField": "Campo personalizado",
"viewIcon": "Icono de la vista"
},
+ "sections": {
+ "board": "Tablero",
+ "rows": "Filas",
+ "show": "Mostrar",
+ "subtasks": "Subtareas",
+ "cardProperties": "Propiedades de la tarjeta",
+ "columns": "Columnas"
+ },
"layoutCommand": "Disposición {layout}"
}
diff --git a/apps/web/messages/fa/display.json b/apps/web/messages/fa/display.json
index 26c26c16..fb1d7513 100644
--- a/apps/web/messages/fa/display.json
+++ b/apps/web/messages/fa/display.json
@@ -75,21 +75,29 @@
"ordering": "ترتیب",
"ascending": "صعودی",
"descending": "نزولی",
- "showEmptyColumns": "نمایش ستون‌های خالی",
- "showEmptyGroups": "نمایش گروه‌های خالی",
- "showLinks": "نمایش پیوندها",
- "separateSubtaskCards": "نمایش زیرتسک‌ها به‌صورت کارت‌های جداگانه",
- "separateSubtaskRows": "نمایش زیرتسک‌ها به‌صورت ردیف‌های جداگانه",
- "startSubtasksCollapsed": "شروع با زیرتسک‌های جمع‌شده",
- "showNestedSubtasks": "نمایش زیرتسک‌های تودرتو",
- "nestedSubtasks": "زیرتسک‌های تودرتو",
- "displayProperties": "نمایش ویژگی‌ها",
+ "emptyColumns": "ستون‌های خالی",
+ "emptyGroups": "گروه‌های خالی",
+ "links": "پیوندها",
+ "separateCards": "به‌صورت کارت‌های جداگانه",
+ "separateRows": "به‌صورت ردیف‌های جداگانه",
+ "nestedInCard": "داخل کارت والد",
+ "nestedInRow": "داخل ردیف والد",
+ "subtasksCollapsed": "شروع به‌صورت جمع‌شده",
+ "groupsCollapsed": "شروع با گروه‌های جمع‌شده",
"placeBy": "قرارگیری بر اساس",
- "startWeekOn": "شروع هفته از",
- "startCollapsed": "شروع با گروه‌های جمع‌شده",
+ "weekStartsOn": "شروع هفته از",
"scale": "مقیاس",
- "addCustomField": "افزودن فیلد سفارشی",
+ "dragToReorder": "برای تغییر ترتیب بکشید",
+ "customField": "فیلد سفارشی",
"viewIcon": "آیکون نما"
},
+ "sections": {
+ "board": "برد",
+ "rows": "ردیف‌ها",
+ "show": "نمایش",
+ "subtasks": "زیرتسک‌ها",
+ "cardProperties": "ویژگی‌های کارت",
+ "columns": "ستون‌ها"
+ },
"layoutCommand": "چیدمان {layout}"
}
diff --git a/apps/web/messages/fr/display.json b/apps/web/messages/fr/display.json
index 1d24eab6..abdceb32 100644
--- a/apps/web/messages/fr/display.json
+++ b/apps/web/messages/fr/display.json
@@ -75,21 +75,29 @@
"ordering": "Tri",
"ascending": "Croissant",
"descending": "Décroissant",
- "showEmptyColumns": "Afficher les colonnes vides",
- "showEmptyGroups": "Afficher les groupes vides",
- "showLinks": "Afficher les liens",
- "separateSubtaskCards": "Afficher les sous-tâches comme des cartes distinctes",
- "separateSubtaskRows": "Afficher les sous-tâches comme des lignes distinctes",
- "startSubtasksCollapsed": "Démarrer avec les sous-tâches réduites",
- "showNestedSubtasks": "Afficher les sous-tâches imbriquées",
- "nestedSubtasks": "Sous-tâches imbriquées",
- "displayProperties": "Propriétés affichées",
+ "emptyColumns": "Colonnes vides",
+ "emptyGroups": "Groupes vides",
+ "links": "Liens",
+ "separateCards": "En cartes distinctes",
+ "separateRows": "En lignes distinctes",
+ "nestedInCard": "Dans la carte parente",
+ "nestedInRow": "Dans la ligne parente",
+ "subtasksCollapsed": "Réduites au départ",
+ "groupsCollapsed": "Groupes réduits au départ",
"placeBy": "Positionner selon",
- "startWeekOn": "Commencer la semaine le",
- "startCollapsed": "Démarrer avec les groupes réduits",
+ "weekStartsOn": "La semaine commence le",
"scale": "Échelle",
- "addCustomField": "Ajouter un champ personnalisé",
+ "dragToReorder": "Glisser pour réordonner",
+ "customField": "Champ personnalisé",
"viewIcon": "Icône de la vue"
},
+ "sections": {
+ "board": "Tableau",
+ "rows": "Lignes",
+ "show": "Afficher",
+ "subtasks": "Sous-tâches",
+ "cardProperties": "Propriétés de la carte",
+ "columns": "Colonnes"
+ },
"layoutCommand": "Affichage {layout}"
}
diff --git a/apps/web/messages/id/display.json b/apps/web/messages/id/display.json
index 8f915697..95002b64 100644
--- a/apps/web/messages/id/display.json
+++ b/apps/web/messages/id/display.json
@@ -75,21 +75,29 @@
"ordering": "Urutan",
"ascending": "Menaik",
"descending": "Menurun",
- "showEmptyColumns": "Tampilkan kolom kosong",
- "showEmptyGroups": "Tampilkan grup kosong",
- "showLinks": "Tampilkan tautan",
- "separateSubtaskCards": "Tampilkan subtugas sebagai kartu terpisah",
- "separateSubtaskRows": "Tampilkan subtugas sebagai baris terpisah",
- "startSubtasksCollapsed": "Mulai dengan subtugas diciutkan",
- "showNestedSubtasks": "Tampilkan subtugas bertingkat",
- "nestedSubtasks": "Subtugas bertingkat",
- "displayProperties": "Properti tampilan",
+ "emptyColumns": "Kolom kosong",
+ "emptyGroups": "Grup kosong",
+ "links": "Tautan",
+ "separateCards": "Sebagai kartu terpisah",
+ "separateRows": "Sebagai baris terpisah",
+ "nestedInCard": "Di dalam kartu induk",
+ "nestedInRow": "Di dalam baris induk",
+ "subtasksCollapsed": "Mulai diciutkan",
+ "groupsCollapsed": "Grup mulai diciutkan",
"placeBy": "Tempatkan berdasarkan",
- "startWeekOn": "Mulai minggu pada",
- "startCollapsed": "Mulai dengan grup diciutkan",
+ "weekStartsOn": "Minggu dimulai pada",
"scale": "Skala",
- "addCustomField": "Tambah bidang kustom",
+ "dragToReorder": "Seret untuk mengurutkan",
+ "customField": "Bidang kustom",
"viewIcon": "Ikon tampilan"
},
+ "sections": {
+ "board": "Papan",
+ "rows": "Baris",
+ "show": "Tampilkan",
+ "subtasks": "Subtugas",
+ "cardProperties": "Properti kartu",
+ "columns": "Kolom"
+ },
"layoutCommand": "Tata letak {layout}"
}
diff --git a/apps/web/messages/ko/display.json b/apps/web/messages/ko/display.json
index 391be272..14b2572e 100644
--- a/apps/web/messages/ko/display.json
+++ b/apps/web/messages/ko/display.json
@@ -75,21 +75,29 @@
"ordering": "정렬",
"ascending": "오름차순",
"descending": "내림차순",
- "showEmptyColumns": "빈 열 표시",
- "showEmptyGroups": "빈 그룹 표시",
- "showLinks": "링크 표시",
- "separateSubtaskCards": "하위 이슈를 별도 카드로 표시",
- "separateSubtaskRows": "하위 이슈를 별도 행으로 표시",
- "startSubtasksCollapsed": "하위 이슈를 접은 상태로 시작",
- "showNestedSubtasks": "중첩된 하위 이슈 표시",
- "nestedSubtasks": "중첩된 하위 이슈",
- "displayProperties": "표시할 속성",
+ "emptyColumns": "빈 열",
+ "emptyGroups": "빈 그룹",
+ "links": "링크",
+ "separateCards": "별도 카드로",
+ "separateRows": "별도 행으로",
+ "nestedInCard": "상위 카드 안에",
+ "nestedInRow": "상위 행 안에",
+ "subtasksCollapsed": "접은 상태로 시작",
+ "groupsCollapsed": "그룹을 접은 상태로 시작",
"placeBy": "배치 기준",
- "startWeekOn": "주 시작 요일",
- "startCollapsed": "그룹을 접은 상태로 시작",
+ "weekStartsOn": "주 시작 요일",
"scale": "시간 단위",
- "addCustomField": "사용자 지정 필드 추가",
+ "dragToReorder": "드래그하여 순서 변경",
+ "customField": "사용자 지정 필드",
"viewIcon": "보기 아이콘"
},
+ "sections": {
+ "board": "보드",
+ "rows": "행",
+ "show": "표시",
+ "subtasks": "하위 이슈",
+ "cardProperties": "카드 속성",
+ "columns": "열"
+ },
"layoutCommand": "{layout} 보기"
}
diff --git a/apps/web/messages/pt-BR/display.json b/apps/web/messages/pt-BR/display.json
index 688353eb..7423ffe7 100644
--- a/apps/web/messages/pt-BR/display.json
+++ b/apps/web/messages/pt-BR/display.json
@@ -75,21 +75,29 @@
"ordering": "Ordenação",
"ascending": "Crescente",
"descending": "Decrescente",
- "showEmptyColumns": "Mostrar colunas vazias",
- "showEmptyGroups": "Mostrar grupos vazios",
- "showLinks": "Mostrar links",
- "separateSubtaskCards": "Mostrar subtarefas como cards separados",
- "separateSubtaskRows": "Mostrar subtarefas como linhas separadas",
- "startSubtasksCollapsed": "Começar com subtarefas recolhidas",
- "showNestedSubtasks": "Mostrar subtarefas aninhadas",
- "nestedSubtasks": "Subtarefas aninhadas",
- "displayProperties": "Exibir propriedades",
+ "emptyColumns": "Colunas vazias",
+ "emptyGroups": "Grupos vazios",
+ "links": "Links",
+ "separateCards": "Como cards separados",
+ "separateRows": "Como linhas separadas",
+ "nestedInCard": "Dentro do card pai",
+ "nestedInRow": "Dentro da linha pai",
+ "subtasksCollapsed": "Começar recolhidas",
+ "groupsCollapsed": "Grupos começam recolhidos",
"placeBy": "Posicionar por",
- "startWeekOn": "Iniciar semana em",
- "startCollapsed": "Começar com grupos recolhidos",
+ "weekStartsOn": "Início da semana",
"scale": "Escala",
- "addCustomField": "Adicionar campo personalizado",
+ "dragToReorder": "Arraste para reordenar",
+ "customField": "Campo personalizado",
"viewIcon": "Ícone da visão"
},
+ "sections": {
+ "board": "Quadro",
+ "rows": "Linhas",
+ "show": "Mostrar",
+ "subtasks": "Subtarefas",
+ "cardProperties": "Propriedades do card",
+ "columns": "Colunas"
+ },
"layoutCommand": "Layout {layout}"
}
diff --git a/apps/web/messages/ru/display.json b/apps/web/messages/ru/display.json
index 77a54f87..6cb00d07 100644
--- a/apps/web/messages/ru/display.json
+++ b/apps/web/messages/ru/display.json
@@ -75,21 +75,29 @@
"ordering": "Сортировка",
"ascending": "По возрастанию",
"descending": "По убыванию",
- "showEmptyColumns": "Показывать пустые колонки",
- "showEmptyGroups": "Показывать пустые группы",
- "showLinks": "Показывать связи",
- "separateSubtaskCards": "Показывать подзадачи отдельно",
- "separateSubtaskRows": "Показывать подзадачи отдельно",
- "startSubtasksCollapsed": "Начинать со свёрнутыми подзадачами",
- "showNestedSubtasks": "Показывать вложенные подзадачи",
- "nestedSubtasks": "Вложенные подзадачи",
- "displayProperties": "Свойства",
+ "emptyColumns": "Пустые колонки",
+ "emptyGroups": "Пустые группы",
+ "links": "Связи",
+ "separateCards": "Отдельными карточками",
+ "separateRows": "Отдельными строками",
+ "nestedInCard": "Внутри родительской карточки",
+ "nestedInRow": "Внутри родительской строки",
+ "subtasksCollapsed": "Начинать свёрнутыми",
+ "groupsCollapsed": "Начинать со свёрнутыми группами",
"placeBy": "Размещать по",
- "startWeekOn": "Начало недели",
- "startCollapsed": "Начинать со свёрнутыми группами",
+ "weekStartsOn": "Начало недели",
"scale": "Масштаб",
- "addCustomField": "Добавить пользовательское поле",
+ "dragToReorder": "Перетащите, чтобы изменить порядок",
+ "customField": "Пользовательское поле",
"viewIcon": "Иконка представления"
},
+ "sections": {
+ "board": "Доска",
+ "rows": "Строки",
+ "show": "Показывать",
+ "subtasks": "Подзадачи",
+ "cardProperties": "Свойства карточки",
+ "columns": "Столбцы"
+ },
"layoutCommand": "Раскладка «{layout}»"
}
diff --git a/apps/web/messages/tr/display.json b/apps/web/messages/tr/display.json
index 055395e8..5c531b3e 100644
--- a/apps/web/messages/tr/display.json
+++ b/apps/web/messages/tr/display.json
@@ -75,21 +75,29 @@
"ordering": "Sıralama",
"ascending": "Artan",
"descending": "Azalan",
- "showEmptyColumns": "Boş sütunları göster",
- "showEmptyGroups": "Boş grupları göster",
- "showLinks": "Bağlantıları göster",
- "separateSubtaskCards": "Alt işleri ayrı kartlar olarak göster",
- "separateSubtaskRows": "Alt işleri ayrı satırlar olarak göster",
- "startSubtasksCollapsed": "Alt işleri daraltılmış başlat",
- "showNestedSubtasks": "İç içe geçmiş alt işleri göster",
- "nestedSubtasks": "İç içe alt işler",
- "displayProperties": "Görüntüleme özellikleri",
+ "emptyColumns": "Boş sütunlar",
+ "emptyGroups": "Boş gruplar",
+ "links": "Bağlantılar",
+ "separateCards": "Ayrı kartlar olarak",
+ "separateRows": "Ayrı satırlar olarak",
+ "nestedInCard": "Üst kartın içinde",
+ "nestedInRow": "Üst satırın içinde",
+ "subtasksCollapsed": "Daraltılmış başlat",
+ "groupsCollapsed": "Grupları daraltılmış başlat",
"placeBy": "Konumlandırma kriteri",
- "startWeekOn": "Haftanın başlangıç günü",
- "startCollapsed": "Grupları daraltılmış başlat",
+ "weekStartsOn": "Haftanın başlangıç günü",
"scale": "Ölçek",
- "addCustomField": "Özel alan ekle",
+ "dragToReorder": "Sıralamak için sürükleyin",
+ "customField": "Özel alan",
"viewIcon": "Görünüm simgesi"
},
+ "sections": {
+ "board": "Pano",
+ "rows": "Satırlar",
+ "show": "Göster",
+ "subtasks": "Alt işler",
+ "cardProperties": "Kart özellikleri",
+ "columns": "Sütunlar"
+ },
"layoutCommand": "{layout} düzeni"
}
diff --git a/apps/web/messages/uk/display.json b/apps/web/messages/uk/display.json
index 1f37b24c..0f43a64e 100644
--- a/apps/web/messages/uk/display.json
+++ b/apps/web/messages/uk/display.json
@@ -75,21 +75,29 @@
"ordering": "Сортування",
"ascending": "За зростанням",
"descending": "За спаданням",
- "showEmptyColumns": "Показувати порожні колонки",
- "showEmptyGroups": "Показувати порожні групи",
- "showLinks": "Показувати зв'язки",
- "separateSubtaskCards": "Показувати підзадачі окремо",
- "separateSubtaskRows": "Показувати підзадачі окремо",
- "startSubtasksCollapsed": "Починати зі згорнутими підзадачами",
- "showNestedSubtasks": "Показувати вкладені підзадачі",
- "nestedSubtasks": "Вкладені підзадачі",
- "displayProperties": "Властивості",
+ "emptyColumns": "Порожні колонки",
+ "emptyGroups": "Порожні групи",
+ "links": "Зв'язки",
+ "separateCards": "Окремими картками",
+ "separateRows": "Окремими рядками",
+ "nestedInCard": "Усередині батьківської картки",
+ "nestedInRow": "Усередині батьківського рядка",
+ "subtasksCollapsed": "Починати згорнутими",
+ "groupsCollapsed": "Починати зі згорнутими групами",
"placeBy": "Розміщувати за",
- "startWeekOn": "Початок тижня",
- "startCollapsed": "Починати зі згорнутими групами",
+ "weekStartsOn": "Початок тижня",
"scale": "Масштаб",
- "addCustomField": "Додати власне поле",
+ "dragToReorder": "Перетягніть, щоб змінити порядок",
+ "customField": "Власне поле",
"viewIcon": "Іконка подання"
},
+ "sections": {
+ "board": "Дошка",
+ "rows": "Рядки",
+ "show": "Показувати",
+ "subtasks": "Підзадачі",
+ "cardProperties": "Властивості картки",
+ "columns": "Стовпці"
+ },
"layoutCommand": "Розкладка «{layout}»"
}
diff --git a/apps/web/messages/zh-CN/display.json b/apps/web/messages/zh-CN/display.json
index 9c910048..e847c632 100644
--- a/apps/web/messages/zh-CN/display.json
+++ b/apps/web/messages/zh-CN/display.json
@@ -75,21 +75,29 @@
"ordering": "排序方式",
"ascending": "升序",
"descending": "降序",
- "showEmptyColumns": "显示空状态列",
- "showEmptyGroups": "显示空分组",
- "showLinks": "显示关联",
- "separateSubtaskCards": "将子任务显示为单独卡片",
- "separateSubtaskRows": "将子任务显示为单独行",
- "startSubtasksCollapsed": "默认折叠子任务",
- "showNestedSubtasks": "显示嵌套子任务",
- "nestedSubtasks": "嵌套子任务",
- "displayProperties": "显示属性",
+ "emptyColumns": "空状态列",
+ "emptyGroups": "空分组",
+ "links": "关联",
+ "separateCards": "作为单独卡片",
+ "separateRows": "作为单独行",
+ "nestedInCard": "在父卡片内",
+ "nestedInRow": "在父行内",
+ "subtasksCollapsed": "默认折叠",
+ "groupsCollapsed": "默认折叠分组",
"placeBy": "定位依据",
- "startWeekOn": "每周起始日",
- "startCollapsed": "默认折叠分组",
+ "weekStartsOn": "每周起始日",
"scale": "时间刻度",
- "addCustomField": "添加自定义字段",
+ "dragToReorder": "拖动以调整顺序",
+ "customField": "自定义字段",
"viewIcon": "视图图标"
},
+ "sections": {
+ "board": "看板",
+ "rows": "行",
+ "show": "显示",
+ "subtasks": "子任务",
+ "cardProperties": "卡片属性",
+ "columns": "列"
+ },
"layoutCommand": "{layout}布局"
}
diff --git a/apps/web/messages/zh-TW/display.json b/apps/web/messages/zh-TW/display.json
index c554c7a4..ab9f5b29 100644
--- a/apps/web/messages/zh-TW/display.json
+++ b/apps/web/messages/zh-TW/display.json
@@ -75,21 +75,29 @@
"ordering": "排序方式",
"ascending": "升序",
"descending": "降序",
- "showEmptyColumns": "顯示空的狀態欄",
- "showEmptyGroups": "顯示空分組",
- "showLinks": "顯示關聯",
- "separateSubtaskCards": "將子任務顯示為單獨卡片",
- "separateSubtaskRows": "將子任務分列顯示",
- "startSubtasksCollapsed": "預設摺疊子任務",
- "showNestedSubtasks": "顯示巢狀子任務",
- "nestedSubtasks": "巢狀子任務",
- "displayProperties": "顯示屬性",
+ "emptyColumns": "空的狀態欄",
+ "emptyGroups": "空分組",
+ "links": "關聯",
+ "separateCards": "作為單獨卡片",
+ "separateRows": "作為單獨的列",
+ "nestedInCard": "在父卡片內",
+ "nestedInRow": "在父列內",
+ "subtasksCollapsed": "預設摺疊",
+ "groupsCollapsed": "預設摺疊分組",
"placeBy": "定位依據",
- "startWeekOn": "每週起始日",
- "startCollapsed": "預設摺疊分組",
+ "weekStartsOn": "每週起始日",
"scale": "時間刻度",
- "addCustomField": "新增自訂欄位",
+ "dragToReorder": "拖曳以調整順序",
+ "customField": "自訂欄位",
"viewIcon": "檢視圖示"
},
+ "sections": {
+ "board": "看板",
+ "rows": "列",
+ "show": "顯示",
+ "subtasks": "子任務",
+ "cardProperties": "卡片屬性",
+ "columns": "欄"
+ },
"layoutCommand": "{layout}版面"
}
diff --git a/apps/web/package.json b/apps/web/package.json
index 01759893..61988808 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -12,6 +12,7 @@
"test": "bun test --preload ./test/setup.ts"
},
"dependencies": {
+ "@animateicons/react": "^0.13.0",
"@base-ui/react": "^1.9.0",
"@better-auth/api-key": "1.7.11",
"@better-auth/oauth-provider": "1.7.11",
diff --git a/apps/web/src/components/layout/ColumnProperties.tsx b/apps/web/src/components/layout/ColumnProperties.tsx
index 64118477..e906f570 100644
--- a/apps/web/src/components/layout/ColumnProperties.tsx
+++ b/apps/web/src/components/layout/ColumnProperties.tsx
@@ -1,4 +1,3 @@
-import type { ReactNode } from 'react';
import { closestCenter, DndContext, type DragEndEvent } from '@dnd-kit/core';
import { arrayMove, rectSortingStrategy, SortableContext } from '@dnd-kit/sortable';
import { useTranslations } from 'next-intl';
@@ -18,19 +17,18 @@ import CustomFieldMenu from '@/components/layout/CustomFieldMenu';
import PropertyChip from '@/components/layout/PropertyChip';
import SortablePropertyChip from '@/components/layout/SortablePropertyChip';
-// The Display-properties chips of a layout that shows properties as columns (Table,
-// Timeline): enabled properties first as a horizontal sortable list (drag to
-// reorder — this is the column order), then the not-yet-shown built-in properties,
-// then the "…" custom-field picker. Clicking an enabled chip removes it; clicking a
-// disabled one adds it (to the end). onChange receives the new ordered `properties`
-// list. A stored key the layout does not render gets no chip.
+// The column chips of a layout that shows properties as columns (Table, Timeline):
+// the enabled properties as a sortable list (drag to reorder — this is the column
+// order), then on a line of their own the not-yet-shown built-in properties and the
+// custom-field picker. Clicking an enabled chip removes it; clicking a disabled one
+// adds it (to the end). onChange receives the new ordered `properties` list. A
+// stored key the layout does not render gets no chip.
export default function ColumnProperties({
properties,
builtins,
customFields,
issueTypes,
onChange,
- trailing,
}: {
properties: PropertyKey[];
// The built-in properties the layout renders; `customFields` holds only the fields
@@ -40,9 +38,6 @@ export default function ColumnProperties({
customFields: CustomField[];
issueTypes: IssueType[];
onChange: (properties: PropertyKey[]) => void;
- // Chips that are not columns, rendered after the property list and before the
- // custom-field picker, which stays last.
- trailing?: ReactNode;
}) {
const t = byKey(useTranslations('display.properties'));
const sensors = useDndSensors();
@@ -73,29 +68,38 @@ export default function ColumnProperties({
}
return (
- <>
- <DndContext sensors={sensors} collisionDetection={closestCenter} onDragEnd={handleDragEnd}>
- <SortableContext items={enabled} strategy={rectSortingStrategy}>
- {enabled.map((key) => (
- <SortablePropertyChip
- key={key}
- id={key}
- label={labelFor(key)!}
- onClick={() => toggle(key)}
- />
- ))}
- </SortableContext>
- </DndContext>
- {disabledBuiltins.map((p) => (
- <PropertyChip key={p} label={t(p)} on={false} onClick={() => toggle(p)} />
- ))}
- {trailing}
- <CustomFieldMenu
- customFields={customFields}
- issueTypes={issueTypes}
- selected={enabledSet}
- onToggle={toggle}
- />
- </>
+ <div className="space-y-2.5 px-2 pt-1">
+ {enabled.length > 0 && (
+ <div className="flex flex-wrap gap-x-1 gap-y-1.5">
+ <DndContext
+ sensors={sensors}
+ collisionDetection={closestCenter}
+ onDragEnd={handleDragEnd}
+ >
+ <SortableContext items={enabled} strategy={rectSortingStrategy}>
+ {enabled.map((key) => (
+ <SortablePropertyChip
+ key={key}
+ id={key}
+ label={labelFor(key)!}
+ onClick={() => toggle(key)}
+ />
+ ))}
+ </SortableContext>
+ </DndContext>
+ </div>
+ )}
+ <div className="flex flex-wrap gap-x-1 gap-y-1.5">
+ {disabledBuiltins.map((p) => (
+ <PropertyChip key={p} label={t(p)} on={false} onClick={() => toggle(p)} />
+ ))}
+ <CustomFieldMenu
+ customFields={customFields}
+ issueTypes={issueTypes}
+ selected={enabledSet}
+ onToggle={toggle}
+ />
+ </div>
+ </div>
);
}
diff --git a/apps/web/src/components/layout/CustomFieldMenu.tsx b/apps/web/src/components/layout/CustomFieldMenu.tsx
index f6a89406..944bf482 100644
--- a/apps/web/src/components/layout/CustomFieldMenu.tsx
+++ b/apps/web/src/components/layout/CustomFieldMenu.tsx
@@ -1,13 +1,15 @@
import { useState } from 'react';
-import { ChevronDown, ChevronRight, MoreHorizontal } from 'lucide-react';
+import { useIconHover } from '@animateicons/react';
+import { PlusIcon } from '@animateicons/react/lucide/plus-icon';
import { useTranslations } from 'next-intl';
import type { CustomField } from '@/lib/api/endpoints/customFields';
import type { IssueType } from '@/lib/api/endpoints/issueTypes';
import type { PropertyKey } from '@/utils/viewSettings';
import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
import CustomFieldRow from '@/components/layout/CustomFieldRow';
+import CustomFieldTypeGroup from '@/components/layout/CustomFieldTypeGroup';
-// The "…" picker that adds custom fields to the display: global fields at the top
+// The picker that adds custom fields to the display: global fields at the top
// level, each issue type an expandable sub-list of its type-scoped fields.
// Nothing renders when the project has no custom fields.
export default function CustomFieldMenu({
@@ -24,6 +26,7 @@ export default function CustomFieldMenu({
const t = useTranslations('display.rows');
const [open, setOpen] = useState(false);
const [expandedType, setExpandedType] = useState<number | null>(null);
+ const { ref, triggerProps } = useIconHover();
const globalFields = customFields.filter((f) => f.issueTypeId == null);
const typeGroups = issueTypes
@@ -36,11 +39,12 @@ export default function CustomFieldMenu({
<Popover open={open} onOpenChange={setOpen}>
<PopoverTrigger asChild>
<button
+ {...triggerProps}
type="button"
- title={t('addCustomField')}
- className="flex items-center rounded-full border px-2 py-1 text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
+ className="inline-flex h-6 items-center gap-1 rounded-full border border-dashed ps-1.5 pe-2 text-xs text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
>
- <MoreHorizontal className="size-3.5" />
+ <PlusIcon ref={ref} size={12} />
+ {t('customField')}
</button>
</PopoverTrigger>
<PopoverContent side="left" align="start" className="w-56 p-1">
@@ -49,31 +53,15 @@ export default function CustomFieldMenu({
<CustomFieldRow key={f.id} field={f} selected={selected} onToggle={onToggle} />
))}
{typeGroups.map(({ type, fields }) => (
- <div key={type.id}>
- <button
- type="button"
- onClick={() => setExpandedType((id) => (id === type.id ? null : type.id))}
- className="flex w-full items-center gap-1.5 rounded px-2 py-1.5 text-left text-sm hover:bg-accent"
- >
- {expandedType === type.id ? (
- <ChevronDown className="size-3.5 shrink-0" />
- ) : (
- <ChevronRight className="size-3.5 shrink-0" />
- )}
- <span
- className="inline-block size-2 shrink-0 rounded-full"
- style={{ backgroundColor: type.color }}
- />
- <span className="flex-1 truncate">{type.name}</span>
- </button>
- {expandedType === type.id && (
- <div className="pl-4">
- {fields.map((f) => (
- <CustomFieldRow key={f.id} field={f} selected={selected} onToggle={onToggle} />
- ))}
- </div>
- )}
- </div>
+ <CustomFieldTypeGroup
+ key={type.id}
+ type={type}
+ fields={fields}
+ expanded={expandedType === type.id}
+ onToggleExpanded={() => setExpandedType((id) => (id === type.id ? null : type.id))}
+ selected={selected}
+ onToggle={onToggle}
+ />
))}
</div>
</PopoverContent>
diff --git a/apps/web/src/components/layout/CustomFieldRow.tsx b/apps/web/src/components/layout/CustomFieldRow.tsx
index ec4779bc..8f15b2c9 100644
--- a/apps/web/src/components/layout/CustomFieldRow.tsx
+++ b/apps/web/src/components/layout/CustomFieldRow.tsx
@@ -1,8 +1,8 @@
-import { Check } from 'lucide-react';
+import { useIconHover } from '@animateicons/react';
+import { CheckIcon } from '@animateicons/react/lucide/check-icon';
import type { CustomField } from '@/lib/api/endpoints/customFields';
import { customFieldKey, type PropertyKey } from '@/utils/viewSettings';
-// One selectable custom field in the picker.
export default function CustomFieldRow({
field,
selected,
@@ -13,14 +13,16 @@ export default function CustomFieldRow({
onToggle: (key: PropertyKey) => void;
}) {
const on = selected.has(customFieldKey(field.id));
+ const { ref, triggerProps } = useIconHover();
return (
<button
+ {...triggerProps}
type="button"
onClick={() => onToggle(customFieldKey(field.id))}
- className="flex w-full items-center gap-2 rounded px-2 py-1.5 text-left text-sm hover:bg-accent"
+ className="flex w-full items-center gap-2 rounded px-2 py-1.5 text-start text-sm hover:bg-accent"
>
<span className="flex-1 truncate">{field.name}</span>
- {on && <Check className="size-3.5 shrink-0" />}
+ {on && <CheckIcon ref={ref} size={14} className="shrink-0" />}
</button>
);
}
diff --git a/apps/web/src/components/layout/CustomFieldTypeGroup.tsx b/apps/web/src/components/layout/CustomFieldTypeGroup.tsx
new file mode 100644
index 00000000..410895c8
--- /dev/null
+++ b/apps/web/src/components/layout/CustomFieldTypeGroup.tsx
@@ -0,0 +1,50 @@
+import { useIconHover } from '@animateicons/react';
+import { ChevronDownIcon } from '@animateicons/react/lucide/chevron-down-icon';
+import { ChevronRightIcon } from '@animateicons/react/lucide/chevron-right-icon';
+import type { CustomField } from '@/lib/api/endpoints/customFields';
+import type { IssueType } from '@/lib/api/endpoints/issueTypes';
+import type { PropertyKey } from '@/utils/viewSettings';
+import CustomFieldRow from '@/components/layout/CustomFieldRow';
+
+export default function CustomFieldTypeGroup({
+ type,
+ fields,
+ expanded,
+ onToggleExpanded,
+ selected,
+ onToggle,
+}: {
+ type: IssueType;
+ fields: CustomField[];
+ expanded: boolean;
+ onToggleExpanded: () => void;
+ selected: Set<string>;
+ onToggle: (key: PropertyKey) => void;
+}) {
+ const { ref, triggerProps } = useIconHover();
+ const Chevron = expanded ? ChevronDownIcon : ChevronRightIcon;
+ return (
+ <div>
+ <button
+ {...triggerProps}
+ type="button"
+ onClick={onToggleExpanded}
+ className="flex w-full items-center gap-1.5 rounded px-2 py-1.5 text-start text-sm hover:bg-accent"
+ >
+ <Chevron ref={ref} size={14} className="shrink-0" />
+ <span
+ className="inline-block size-2 shrink-0 rounded-full"
+ style={{ backgroundColor: type.color }}
+ />
+ <span className="flex-1 truncate">{type.name}</span>
+ </button>
+ {expanded && (
+ <div className="ps-4">
+ {fields.map((f) => (
+ <CustomFieldRow key={f.id} field={f} selected={selected} onToggle={onToggle} />
+ ))}
+ </div>
+ )}
+ </div>
+ );
+}
diff --git a/apps/web/src/components/layout/DisplayCalendarRows.tsx b/apps/web/src/components/layout/DisplayCalendarRows.tsx
index a532c156..010db4c5 100644
--- a/apps/web/src/components/layout/DisplayCalendarRows.tsx
+++ b/apps/web/src/components/layout/DisplayCalendarRows.tsx
@@ -9,13 +9,14 @@ import {
} from '@/utils/viewSettings';
import { isCalendarField } from '@/utils/calendarFields';
import { byKey } from '@/utils/messageKey';
+import DisplaySection from '@/components/layout/DisplaySection';
+import DisplaySegmented from '@/components/layout/DisplaySegmented';
import DisplaySettingsRow from '@/components/layout/DisplaySettingsRow';
import DisplaySettingsSelect from '@/components/layout/DisplaySettingsSelect';
const DATE_FIELDS: BuiltinDateField[] = ['dueDate', 'startDate'];
const WEEK_STARTS = ['0', '1'] as const;
-// The Display settings rows that only apply to the Calendar layout.
export default function DisplayCalendarRows({
settings,
customFields,
@@ -35,7 +36,7 @@ export default function DisplayCalendarRows({
.map((f) => ({ value: customFieldKey(f.id), label: f.name })),
];
return (
- <>
+ <DisplaySection>
<DisplaySettingsRow label={t('placeBy')}>
<DisplaySettingsSelect
value={settings.calendarDateField}
@@ -43,13 +44,13 @@ export default function DisplayCalendarRows({
options={options}
/>
</DisplaySettingsRow>
- <DisplaySettingsRow label={t('startWeekOn')}>
- <DisplaySettingsSelect
+ <DisplaySettingsRow label={t('weekStartsOn')}>
+ <DisplaySegmented
value={String(settings.weekStart)}
onChange={(v) => onChange({ weekStart: Number(v) as WeekStart })}
options={WEEK_STARTS.map((value) => ({ value, label: weekStart(value) }))}
/>
</DisplaySettingsRow>
- </>
+ </DisplaySection>
);
}
diff --git a/apps/web/src/components/layout/DisplayGroupingRows.tsx b/apps/web/src/components/layout/DisplayGroupingRows.tsx
index bfa8d627..cd1cbb2c 100644
--- a/apps/web/src/components/layout/DisplayGroupingRows.tsx
+++ b/apps/web/src/components/layout/DisplayGroupingRows.tsx
@@ -1,7 +1,6 @@
-import { ArrowDownNarrowWide, ArrowUpNarrowWide } from 'lucide-react';
import { useTranslations } from 'next-intl';
import type { CustomField } from '@/lib/api/endpoints/customFields';
-import { SORT_FIELDS, type SortField, type WorkItemsView } from '@/utils/viewTypes';
+import type { WorkItemsView } from '@/utils/viewTypes';
import {
customFieldKey,
isFieldEnabled,
@@ -12,17 +11,14 @@ import {
import { isMemberField } from '@/utils/memberFields';
import { byKey } from '@/utils/messageKey';
import { useProjectFeatures } from '@/hooks/useProjectFeatures';
-import { Button } from '@/components/ui/button';
-import { Checkbox } from '@/components/ui/checkbox';
+import DisplayOrderingRow from '@/components/layout/DisplayOrderingRow';
+import DisplaySection from '@/components/layout/DisplaySection';
import DisplaySettingsRow from '@/components/layout/DisplaySettingsRow';
import DisplaySettingsSelect from '@/components/layout/DisplaySettingsSelect';
-
-// Views that lay issues out as a list honor ordering; the date-laid-out
-// Timeline and Calendar ignore it.
-const ORDERING_VIEWS: WorkItemsView[] = ['kanban', 'table'];
+import DisplayToggleRow from '@/components/layout/DisplayToggleRow';
// Grouping fields, in menu order, before the project's own member custom fields.
-// Project always groups by something, so it drops 'none'.
+// Kanban and Timeline always group by something, so they drop 'none'.
const GROUP_FIELDS: BuiltinGroupField[] = [
'none',
'status',
@@ -34,11 +30,8 @@ const GROUP_FIELDS: BuiltinGroupField[] = [
'cycle',
];
-// The grouping, sub-grouping, ordering, empty-group, links and subtasks rows.
-// Which of them show depends on the layout: Timeline groups but does not order,
-// Calendar does neither, and sub-grouping needs a primary group. Nested subtasks
-// is a Display-properties chip on Project and Table; the Timeline has no chips, so
-// it carries that toggle as a row here.
+// The Timeline lays its issues out by date, so instead of an ordering it offers the
+// initial state of its groups.
export default function DisplayGroupingRows({
view,
settings,
@@ -50,9 +43,8 @@ export default function DisplayGroupingRows({
customFields: CustomField[];
onChange: (patch: Partial<ViewSettings>) => void;
}) {
- const t = useTranslations('display.rows');
+ const t = useTranslations('display');
const groupLabel = byKey(useTranslations('display.groupFields'));
- const sortLabel = byKey(useTranslations('display.sortFields'));
// Changing the primary group clears a sub-group that would now duplicate it.
const setGroup = (group: GroupField) =>
@@ -70,29 +62,23 @@ export default function DisplayGroupingRows({
...memberOptions,
];
- const groupOptions = toOptions(
- view === 'kanban' || view === 'timeline' ? fields.filter((f) => f !== 'none') : fields,
- );
+ const kanban = view === 'kanban';
+ const groupOptions = toOptions(view === 'table' ? fields : fields.filter((f) => f !== 'none'));
// The sub-group never offers the field already used by the primary group.
const subgroupOptions = toOptions(fields).filter((o) => o.value !== settings.group);
- const sortOptions = SORT_FIELDS.map((value) => ({ value, label: sortLabel(value) }));
- const showsGrouping = view === 'kanban' || view === 'table' || view === 'timeline';
- const showsSubgrouping = showsGrouping && settings.group !== 'none';
return (
- <>
- {showsGrouping && (
- <DisplaySettingsRow label={view === 'kanban' ? t('columns') : t('grouping')}>
- <DisplaySettingsSelect
- value={settings.group}
- onChange={(v) => setGroup(v as GroupField)}
- options={groupOptions}
- />
- </DisplaySettingsRow>
- )}
+ <DisplaySection title={kanban ? t('sections.board') : t('sections.rows')}>
+ <DisplaySettingsRow label={kanban ? t('rows.columns') : t('rows.grouping')}>
+ <DisplaySettingsSelect
+ value={settings.group}
+ onChange={(v) => setGroup(v as GroupField)}
+ options={groupOptions}
+ />
+ </DisplaySettingsRow>
- {showsSubgrouping && (
- <DisplaySettingsRow label={view === 'kanban' ? t('swimlanes') : t('subGrouping')}>
+ {settings.group !== 'none' && (
+ <DisplaySettingsRow label={kanban ? t('rows.swimlanes') : t('rows.subGrouping')}>
<DisplaySettingsSelect
value={settings.subgroup}
onChange={(v) => onChange({ subgroup: v as GroupField })}
@@ -101,80 +87,15 @@ export default function DisplayGroupingRows({
</DisplaySettingsRow>
)}
- {ORDERING_VIEWS.includes(view) && (
- <DisplaySettingsRow label={t('ordering')}>
- <Button
- variant="outline"
- size="icon"
- className="size-8 shrink-0"
- disabled={settings.sort.field === 'manual'}
- title={settings.sort.dir === 'asc' ? t('ascending') : t('descending')}
- onClick={() =>
- onChange({
- sort: { ...settings.sort, dir: settings.sort.dir === 'asc' ? 'desc' : 'asc' },
- })
- }
- >
- {settings.sort.dir === 'asc' ? <ArrowUpNarrowWide /> : <ArrowDownNarrowWide />}
- </Button>
- <DisplaySettingsSelect
- value={settings.sort.field}
- onChange={(v) => onChange({ sort: { ...settings.sort, field: v as SortField } })}
- options={sortOptions}
- />
- </DisplaySettingsRow>
- )}
-
- {showsGrouping && settings.group !== 'none' && (
- <DisplaySettingsRow
- label={view === 'kanban' ? t('showEmptyColumns') : t('showEmptyGroups')}
- >
- <Checkbox
- checked={settings.showEmptyGroups}
- onCheckedChange={(c) => onChange({ showEmptyGroups: c === true })}
- />
- </DisplaySettingsRow>
- )}
-
- {showsGrouping && (
- <>
- <DisplaySettingsRow label={t('showLinks')}>
- <Checkbox
- checked={settings.showLinks}
- onCheckedChange={(c) => onChange({ showLinks: c === true })}
- />
- </DisplaySettingsRow>
-
- {features.subtasks && (
- <>
- <DisplaySettingsRow
- label={view === 'kanban' ? t('separateSubtaskCards') : t('separateSubtaskRows')}
- >
- <Checkbox
- checked={settings.separateSubtasks}
- onCheckedChange={(c) => onChange({ separateSubtasks: c === true })}
- />
- </DisplaySettingsRow>
-
- <DisplaySettingsRow label={t('startSubtasksCollapsed')}>
- <Checkbox
- checked={settings.collapseSubtasks}
- onCheckedChange={(c) => onChange({ collapseSubtasks: c === true })}
- />
- </DisplaySettingsRow>
-
- {view === 'timeline' && (
- <DisplaySettingsRow label={t('showNestedSubtasks')}>
- <Checkbox
- checked={settings.showSubtasks}
- onCheckedChange={(c) => onChange({ showSubtasks: c === true })}
- />
- </DisplaySettingsRow>
- )}
- </>
- )}
- </>
+ {view === 'timeline' ? (
+ <DisplayToggleRow
+ label={t('rows.groupsCollapsed')}
+ checked={settings.timelineCollapseAll}
+ onCheckedChange={(timelineCollapseAll) => onChange({ timelineCollapseAll })}
+ />
+ ) : (
+ <DisplayOrderingRow sort={settings.sort} onChange={(sort) => onChange({ sort })} />
)}
- </>
+ </DisplaySection>
);
}
diff --git a/apps/web/src/components/layout/DisplayLayoutTabs.tsx b/apps/web/src/components/layout/DisplayLayoutTabs.tsx
index 36120713..21401ddc 100644
--- a/apps/web/src/components/layout/DisplayLayoutTabs.tsx
+++ b/apps/web/src/components/layout/DisplayLayoutTabs.tsx
@@ -1,13 +1,11 @@
import { useTranslations } from 'next-intl';
import { byKey } from '@/utils/messageKey';
import { useHotkeyFormatter } from '@/context/useHotkeys';
-import { cn } from '@/lib/utils';
import { VIEWS, type WorkItemsView } from '@/utils/viewTypes';
-import { Tabs, TabsList, TabsTrigger } from '@/components/ui/tabs';
+import DisplaySegmented from '@/components/layout/DisplaySegmented';
-// The layout switcher at the top of the Display settings: one tab per work items
-// layout, the active one showing its label. The hotkey is appended to the tooltip
-// when the layout has one bound.
+// The layout switcher at the top of the Display settings. The hotkey goes in the
+// tooltip when the layout has one bound.
export default function DisplayLayoutTabs({
view,
onViewChange,
@@ -19,23 +17,14 @@ export default function DisplayLayoutTabs({
const hotkey = useHotkeyFormatter();
return (
- <Tabs value={view} onValueChange={(v) => onViewChange(v as WorkItemsView)}>
- <TabsList className="w-full">
- {VIEWS.map(({ value, icon: Icon, hotkey: id }) => {
- const label = t(value);
- return (
- <TabsTrigger
- key={value}
- value={value}
- title={hotkey(id) ? `${label} (${hotkey(id)})` : label}
- className={cn('min-w-0 gap-1.5 px-1.5', value === view ? 'flex-1' : 'flex-none')}
- >
- <Icon className="size-3.5" />
- {value === view && <span className="truncate text-xs">{label}</span>}
- </TabsTrigger>
- );
- })}
- </TabsList>
- </Tabs>
+ <DisplaySegmented
+ value={view}
+ onChange={onViewChange}
+ options={VIEWS.map(({ value, icon, hotkey: id }) => {
+ const label = t(value);
+ const key = hotkey(id);
+ return { value, label, icon, title: key ? `${label} (${key})` : undefined };
+ })}
+ />
);
}
diff --git a/apps/web/src/components/layout/DisplayOrderingRow.tsx b/apps/web/src/components/layout/DisplayOrderingRow.tsx
new file mode 100644
index 00000000..54b60402
--- /dev/null
+++ b/apps/web/src/components/layout/DisplayOrderingRow.tsx
@@ -0,0 +1,48 @@
+import { useIconHover } from '@animateicons/react';
+import { ArrowDownNarrowWideIcon } from '@animateicons/react/lucide/arrow-down-narrow-wide-icon';
+import { ArrowUpNarrowWideIcon } from '@animateicons/react/lucide/arrow-up-narrow-wide-icon';
+import { useTranslations } from 'next-intl';
+import { byKey } from '@/utils/messageKey';
+import { SORT_FIELDS, type SortField } from '@/utils/viewTypes';
+import type { ViewSettings } from '@/utils/viewSettings';
+import { Button } from '@/components/ui/button';
+import DisplaySettingsRow from '@/components/layout/DisplaySettingsRow';
+import DisplaySettingsSelect from '@/components/layout/DisplaySettingsSelect';
+
+// A manual order has no direction, so the direction button shows only for a sort field.
+export default function DisplayOrderingRow({
+ sort,
+ onChange,
+}: {
+ sort: ViewSettings['sort'];
+ onChange: (sort: ViewSettings['sort']) => void;
+}) {
+ const t = useTranslations('display.rows');
+ const sortLabel = byKey(useTranslations('display.sortFields'));
+ const direction = sort.dir === 'asc' ? t('ascending') : t('descending');
+ const DirectionIcon = sort.dir === 'asc' ? ArrowUpNarrowWideIcon : ArrowDownNarrowWideIcon;
+ const { ref, triggerProps } = useIconHover();
+
+ return (
+ <DisplaySettingsRow label={t('ordering')}>
+ {sort.field !== 'manual' && (
+ <Button
+ {...triggerProps}
+ variant="ghost"
+ size="icon"
+ className="size-7 text-muted-foreground"
+ title={direction}
+ aria-label={direction}
+ onClick={() => onChange({ ...sort, dir: sort.dir === 'asc' ? 'desc' : 'asc' })}
+ >
+ <DirectionIcon ref={ref} size={16} />
+ </Button>
+ )}
+ <DisplaySettingsSelect
+ value={sort.field}
+ onChange={(v) => onChange({ ...sort, field: v as SortField })}
+ options={SORT_FIELDS.map((value) => ({ value, label: sortLabel(value) }))}
+ />
+ </DisplaySettingsRow>
+ );
+}
diff --git a/apps/web/src/components/layout/DisplayPopover.tsx b/apps/web/src/components/layout/DisplayPopover.tsx
index 2cac2eda..23053dc3 100644
--- a/apps/web/src/components/layout/DisplayPopover.tsx
+++ b/apps/web/src/components/layout/DisplayPopover.tsx
@@ -1,13 +1,13 @@
import { useState } from 'react';
-import { SlidersHorizontal } from 'lucide-react';
+import { SlidersHorizontalIcon } from '@animateicons/react/lucide/sliders-horizontal-icon';
import { useTranslations } from 'next-intl';
import type { CustomField } from '@/lib/api/endpoints/customFields';
import type { IssueType } from '@/lib/api/endpoints/issueTypes';
import type { ViewSettings } from '@/utils/viewSettings';
import type { WorkItemsView } from '@/utils/viewTypes';
-import { cn } from '@/lib/utils';
import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
import DisplaySettingsBody from '@/components/layout/DisplaySettingsBody';
+import ToolbarIconButton from '@/components/layout/ToolbarIconButton';
// The display settings (layout switcher plus the selected layout's options) in a
// popover anchored to the sliders button.
@@ -31,18 +31,9 @@ export default function DisplayPopover({
return (
<Popover open={open} onOpenChange={setOpen}>
<PopoverTrigger asChild>
- <button
- type="button"
- title={t('title')}
- className={cn(
- 'rounded-md p-1.5 hover:bg-accent hover:text-foreground',
- open ? 'bg-accent text-foreground' : 'text-muted-foreground',
- )}
- >
- <SlidersHorizontal className="size-4" />
- </button>
+ <ToolbarIconButton icon={SlidersHorizontalIcon} title={t('title')} active={open} />
</PopoverTrigger>
- <PopoverContent align="end" className="max-h-[70vh] w-80 overflow-y-auto p-3">
+ <PopoverContent align="end" className="max-h-[70vh] w-88 overflow-y-auto p-2">
<DisplaySettingsBody
view={view}
onViewChange={onViewChange}
diff --git a/apps/web/src/components/layout/DisplayPropertiesSection.tsx b/apps/web/src/components/layout/DisplayPropertiesSection.tsx
index af111c85..3587ca0e 100644
--- a/apps/web/src/components/layout/DisplayPropertiesSection.tsx
+++ b/apps/web/src/components/layout/DisplayPropertiesSection.tsx
@@ -13,12 +13,11 @@ import type { WorkItemsView } from '@/utils/viewTypes';
import { useProjectFeatures } from '@/hooks/useProjectFeatures';
import PropertyChip from '@/components/layout/PropertyChip';
import ColumnProperties from '@/components/layout/ColumnProperties';
+import DisplaySection from '@/components/layout/DisplaySection';
-// The Display properties block. On the Table and the Timeline the chips are the
-// column list, sortable and extendable with custom fields; on Project they are plain
-// on/off chips for the built-in properties. The Nested subtasks chip is neither a
-// column nor a property — it toggles the subtask rows under a card or row — so it
-// sits after the property chips.
+// The properties an issue shows. On the Kanban they are plain on/off chips for the
+// card; on the Table and the Timeline they are the columns, sortable and extendable
+// with custom fields.
export default function DisplayPropertiesSection({
view,
settings,
@@ -35,57 +34,42 @@ export default function DisplayPropertiesSection({
const t = useTranslations('display');
const property = byKey(useTranslations('display.properties'));
const features = useProjectFeatures();
- const properties = offeredDisplayProperties(features);
- // Enabling appends to the end (a new column shows on the right); disabling
- // removes. Order is otherwise preserved.
- const toggleProperty = (property: PropertyKey) =>
- onChange({
- properties: settings.properties.includes(property)
- ? settings.properties.filter((p) => p !== property)
- : [...settings.properties, property],
- });
+ if (view === 'kanban') {
+ const toggle = (p: PropertyKey) =>
+ onChange({
+ properties: settings.properties.includes(p)
+ ? settings.properties.filter((k) => k !== p)
+ : [...settings.properties, p],
+ });
+ return (
+ <DisplaySection title={t('sections.cardProperties')}>
+ <div className="flex flex-wrap gap-x-1 gap-y-1.5 px-2 pt-1">
+ {offeredDisplayProperties(features).map((p) => (
+ <PropertyChip
+ key={p}
+ label={property(p)}
+ on={settings.properties.includes(p)}
+ onClick={() => toggle(p)}
+ />
+ ))}
+ </div>
+ </DisplaySection>
+ );
+ }
- const subtasksChip = features.subtasks ? (
- <PropertyChip
- label={t('rows.nestedSubtasks')}
- on={settings.showSubtasks}
- onClick={() => onChange({ showSubtasks: !settings.showSubtasks })}
- />
- ) : null;
// The Timeline offers neither the identifier, which its title column always
- // shows, nor a text or markdown field, and toggles the subtasks in a row of its own.
+ // shows, nor a text or markdown field.
const timeline = view === 'timeline';
-
return (
- <div className="space-y-3 border-t pt-2">
- <p className="px-1 text-xs font-medium text-muted-foreground">
- {t('rows.displayProperties')}
- </p>
- <div className="flex flex-wrap items-center gap-1 px-1">
- {view === 'table' || timeline ? (
- <ColumnProperties
- properties={settings.properties}
- builtins={timeline ? DISPLAY_PROPERTIES.filter((p) => p !== 'id') : DISPLAY_PROPERTIES}
- customFields={timeline ? customFields.filter(isTimelineField) : customFields}
- issueTypes={issueTypes}
- onChange={(properties) => onChange({ properties })}
- trailing={timeline ? null : subtasksChip}
- />
- ) : (
- <>
- {properties.map((p) => (
- <PropertyChip
- key={p}
- label={property(p)}
- on={settings.properties.includes(p)}
- onClick={() => toggleProperty(p)}
- />
- ))}
- {subtasksChip}
- </>
- )}
- </div>
- </div>
+ <DisplaySection title={t('sections.columns')} hint={t('rows.dragToReorder')}>
+ <ColumnProperties
+ properties={settings.properties}
+ builtins={timeline ? DISPLAY_PROPERTIES.filter((p) => p !== 'id') : DISPLAY_PROPERTIES}
+ customFields={timeline ? customFields.filter(isTimelineField) : customFields}
+ issueTypes={issueTypes}
+ onChange={(properties) => onChange({ properties })}
+ />
+ </DisplaySection>
);
}
diff --git a/apps/web/src/components/layout/DisplaySection.tsx b/apps/web/src/components/layout/DisplaySection.tsx
new file mode 100644
index 00000000..e83a9a1f
--- /dev/null
+++ b/apps/web/src/components/layout/DisplaySection.tsx
@@ -0,0 +1,29 @@
+import type { ReactNode } from 'react';
+import { cn } from '@/lib/utils';
+
+export default function DisplaySection({
+ title,
+ hint,
+ children,
+}: {
+ title?: string;
+ hint?: string;
+ children: ReactNode;
+}) {
+ return (
+ <section
+ className={cn(
+ 'relative pb-2 before:absolute before:inset-x-2 before:top-0 before:h-px before:bg-border/60 first:before:hidden',
+ title ? 'pt-3' : 'pt-2',
+ )}
+ >
+ {title && (
+ <div className="flex items-baseline justify-between gap-2 px-2 pb-1">
+ <h3 className="text-xs leading-4 font-medium text-muted-foreground">{title}</h3>
+ {hint && <span className="text-xs leading-4 text-muted-foreground/60">{hint}</span>}
+ </div>
+ )}
+ {children}
+ </section>
+ );
+}
diff --git a/apps/web/src/components/layout/DisplaySegmented.tsx b/apps/web/src/components/layout/DisplaySegmented.tsx
new file mode 100644
index 00000000..7bc4b2f4
--- /dev/null
+++ b/apps/web/src/components/layout/DisplaySegmented.tsx
@@ -0,0 +1,32 @@
+import { cn } from '@/lib/utils';
+import type { AnimatedIcon } from '@/lib/animatedIcon';
+import { Tabs, TabsList } from '@/components/ui/tabs';
+import DisplaySegmentedItem from '@/components/layout/DisplaySegmentedItem';
+
+// Options with icons render as tiles (the layout switcher); plain options as a
+// compact strip.
+export default function DisplaySegmented<T extends string>({
+ value,
+ onChange,
+ options,
+}: {
+ value: T;
+ onChange: (value: T) => void;
+ options: { value: T; label: string; icon?: AnimatedIcon; title?: string }[];
+}) {
+ const tiles = options.some((o) => o.icon);
+ return (
+ <Tabs value={value} onValueChange={(v) => onChange(v as T)}>
+ <TabsList
+ className={cn(
+ 'h-auto bg-foreground/[0.04] p-0.5',
+ tiles && 'grid w-full auto-cols-[minmax(max-content,1fr)] grid-flow-col',
+ )}
+ >
+ {options.map((o) => (
+ <DisplaySegmentedItem key={o.value} {...o} tile={tiles} />
+ ))}
+ </TabsList>
+ </Tabs>
+ );
+}
diff --git a/apps/web/src/components/layout/DisplaySegmentedItem.tsx b/apps/web/src/components/layout/DisplaySegmentedItem.tsx
new file mode 100644
index 00000000..3531eb84
--- /dev/null
+++ b/apps/web/src/components/layout/DisplaySegmentedItem.tsx
@@ -0,0 +1,34 @@
+import { useIconHover } from '@animateicons/react';
+import { cn } from '@/lib/utils';
+import type { AnimatedIcon } from '@/lib/animatedIcon';
+import { TabsTrigger } from '@/components/ui/tabs';
+
+export default function DisplaySegmentedItem({
+ value,
+ label,
+ icon: Icon,
+ title,
+ tile,
+}: {
+ value: string;
+ label: string;
+ icon?: AnimatedIcon;
+ title?: string;
+ tile: boolean;
+}) {
+ const { ref, triggerProps } = useIconHover();
+ return (
+ <TabsTrigger
+ {...triggerProps}
+ value={value}
+ title={title}
+ className={cn(
+ 'text-xs font-normal text-muted-foreground data-[state=active]:font-medium dark:data-[state=active]:bg-secondary',
+ tile ? 'flex-col gap-1 py-1.5 leading-4' : 'h-6 px-2.5',
+ )}
+ >
+ {Icon && <Icon ref={ref} size={16} />}
+ {label}
+ </TabsTrigger>
+ );
+}
diff --git a/apps/web/src/components/layout/DisplaySettingsBody.tsx b/apps/web/src/components/layout/DisplaySettingsBody.tsx
index ba6a516c..2e3db6f3 100644
--- a/apps/web/src/components/layout/DisplaySettingsBody.tsx
+++ b/apps/web/src/components/layout/DisplaySettingsBody.tsx
@@ -6,12 +6,12 @@ import DisplayCalendarRows from '@/components/layout/DisplayCalendarRows';
import DisplayGroupingRows from '@/components/layout/DisplayGroupingRows';
import DisplayLayoutTabs from '@/components/layout/DisplayLayoutTabs';
import DisplayPropertiesSection from '@/components/layout/DisplayPropertiesSection';
+import DisplayShowRows from '@/components/layout/DisplayShowRows';
+import DisplaySubtaskRows from '@/components/layout/DisplaySubtaskRows';
import DisplayTimelineRows from '@/components/layout/DisplayTimelineRows';
-// The body of the Display settings: a tabbed layout switcher (Project/Table/
-// Timeline/Calendar) and the settings for the selected layout. Rendered inside
-// the DisplayPopover. Settings belong to the active project+view or saved view
-// (see the view editor and lib/viewSettings).
+// Settings belong to the active project+view or saved view (see the view editor and
+// utils/viewSettings).
export default function DisplaySettingsBody({
view,
onViewChange,
@@ -30,31 +30,33 @@ export default function DisplaySettingsBody({
const set = (patch: Partial<ViewSettings>) => onSettingsChange({ ...settings, ...patch });
return (
- <div className="space-y-2">
+ <>
<DisplayLayoutTabs view={view} onViewChange={onViewChange} />
- <DisplayGroupingRows
- view={view}
- settings={settings}
- customFields={customFields}
- onChange={set}
- />
-
- {view === 'timeline' && <DisplayTimelineRows settings={settings} onChange={set} />}
-
- {view === 'calendar' && (
- <DisplayCalendarRows settings={settings} customFields={customFields} onChange={set} />
- )}
-
- {(view === 'kanban' || view === 'table' || view === 'timeline') && (
- <DisplayPropertiesSection
- view={view}
- settings={settings}
- onChange={set}
- customFields={customFields}
- issueTypes={issueTypes}
- />
- )}
- </div>
+ <div>
+ {view === 'calendar' ? (
+ <DisplayCalendarRows settings={settings} customFields={customFields} onChange={set} />
+ ) : (
+ <>
+ {view === 'timeline' && <DisplayTimelineRows settings={settings} onChange={set} />}
+ <DisplayGroupingRows
+ view={view}
+ settings={settings}
+ customFields={customFields}
+ onChange={set}
+ />
+ <DisplayShowRows view={view} settings={settings} onChange={set} />
+ <DisplaySubtaskRows view={view} settings={settings} onChange={set} />
+ <DisplayPropertiesSection
+ view={view}
+ settings={settings}
+ onChange={set}
+ customFields={customFields}
+ issueTypes={issueTypes}
+ />
+ </>
+ )}
+ </div>
+ </>
);
}
diff --git a/apps/web/src/components/layout/DisplaySettingsRow.tsx b/apps/web/src/components/layout/DisplaySettingsRow.tsx
index fc81f593..138e0c18 100644
--- a/apps/web/src/components/layout/DisplaySettingsRow.tsx
+++ b/apps/web/src/components/layout/DisplaySettingsRow.tsx
@@ -8,9 +8,9 @@ export default function DisplaySettingsRow({
children: ReactNode;
}) {
return (
- <div className="flex min-h-8 items-center justify-between gap-2 px-1">
+ <div className="flex min-h-8 items-center justify-between gap-2 ps-2 pe-0.5">
<span className="text-sm text-muted-foreground">{label}</span>
- <div className="flex items-center gap-1.5">{children}</div>
+ <div className="flex items-center gap-0.5">{children}</div>
</div>
);
}
diff --git a/apps/web/src/components/layout/DisplaySettingsSelect.tsx b/apps/web/src/components/layout/DisplaySettingsSelect.tsx
index 41b7a66c..32e07aa2 100644
--- a/apps/web/src/components/layout/DisplaySettingsSelect.tsx
+++ b/apps/web/src/components/layout/DisplaySettingsSelect.tsx
@@ -6,9 +6,6 @@ import {
SelectValue,
} from '@/components/ui/select';
-// The dropdown used by every Display settings row, so they share one width and
-// trigger size. Values are strings; a row with a non-string setting converts on
-// both sides (see the calendar week start).
export default function DisplaySettingsSelect({
value,
onChange,
@@ -20,7 +17,10 @@ export default function DisplaySettingsSelect({
}) {
return (
<Select value={value} onValueChange={onChange}>
- <SelectTrigger size="sm" className="w-40">
+ <SelectTrigger
+ size="sm"
+ className="gap-1 border-0 bg-transparent px-2 font-medium shadow-none hover:bg-accent data-[size=sm]:h-7 dark:bg-transparent dark:hover:bg-accent"
+ >
<SelectValue />
</SelectTrigger>
<SelectContent>
diff --git a/apps/web/src/components/layout/DisplayShowRows.tsx b/apps/web/src/components/layout/DisplayShowRows.tsx
new file mode 100644
index 00000000..20ff6b79
--- /dev/null
+++ b/apps/web/src/components/layout/DisplayShowRows.tsx
@@ -0,0 +1,33 @@
+import { useTranslations } from 'next-intl';
+import type { ViewSettings } from '@/utils/viewSettings';
+import type { WorkItemsView } from '@/utils/viewTypes';
+import DisplaySection from '@/components/layout/DisplaySection';
+import DisplayToggleRow from '@/components/layout/DisplayToggleRow';
+
+export default function DisplayShowRows({
+ view,
+ settings,
+ onChange,
+}: {
+ view: WorkItemsView;
+ settings: ViewSettings;
+ onChange: (patch: Partial<ViewSettings>) => void;
+}) {
+ const t = useTranslations('display');
+ return (
+ <DisplaySection title={t('sections.show')}>
+ {settings.group !== 'none' && (
+ <DisplayToggleRow
+ label={view === 'kanban' ? t('rows.emptyColumns') : t('rows.emptyGroups')}
+ checked={settings.showEmptyGroups}
+ onCheckedChange={(showEmptyGroups) => onChange({ showEmptyGroups })}
+ />
+ )}
+ <DisplayToggleRow
+ label={t('rows.links')}
+ checked={settings.showLinks}
+ onCheckedChange={(showLinks) => onChange({ showLinks })}
+ />
+ </DisplaySection>
+ );
+}
diff --git a/apps/web/src/components/layout/DisplaySubtaskRows.tsx b/apps/web/src/components/layout/DisplaySubtaskRows.tsx
new file mode 100644
index 00000000..b04a221a
--- /dev/null
+++ b/apps/web/src/components/layout/DisplaySubtaskRows.tsx
@@ -0,0 +1,41 @@
+import { useTranslations } from 'next-intl';
+import type { ViewSettings } from '@/utils/viewSettings';
+import type { WorkItemsView } from '@/utils/viewTypes';
+import { useProjectFeatures } from '@/hooks/useProjectFeatures';
+import DisplaySection from '@/components/layout/DisplaySection';
+import DisplayToggleRow from '@/components/layout/DisplayToggleRow';
+
+export default function DisplaySubtaskRows({
+ view,
+ settings,
+ onChange,
+}: {
+ view: WorkItemsView;
+ settings: ViewSettings;
+ onChange: (patch: Partial<ViewSettings>) => void;
+}) {
+ const t = useTranslations('display');
+ const features = useProjectFeatures();
+ if (!features.subtasks) return null;
+
+ const kanban = view === 'kanban';
+ return (
+ <DisplaySection title={t('sections.subtasks')}>
+ <DisplayToggleRow
+ label={kanban ? t('rows.separateCards') : t('rows.separateRows')}
+ checked={settings.separateSubtasks}
+ onCheckedChange={(separateSubtasks) => onChange({ separateSubtasks })}
+ />
+ <DisplayToggleRow
+ label={kanban ? t('rows.nestedInCard') : t('rows.nestedInRow')}
+ checked={settings.showSubtasks}
+ onCheckedChange={(showSubtasks) => onChange({ showSubtasks })}
+ />
+ <DisplayToggleRow
+ label={t('rows.subtasksCollapsed')}
+ checked={settings.collapseSubtasks}
+ onCheckedChange={(collapseSubtasks) => onChange({ collapseSubtasks })}
+ />
+ </DisplaySection>
+ );
+}
diff --git a/apps/web/src/components/layout/DisplayTimelineRows.tsx b/apps/web/src/components/layout/DisplayTimelineRows.tsx
index 0ef058ad..7b36ca2e 100644
--- a/apps/web/src/components/layout/DisplayTimelineRows.tsx
+++ b/apps/web/src/components/layout/DisplayTimelineRows.tsx
@@ -1,13 +1,12 @@
import { useTranslations } from 'next-intl';
import type { TimelineScale, ViewSettings } from '@/utils/viewSettings';
import { byKey } from '@/utils/messageKey';
-import { Checkbox } from '@/components/ui/checkbox';
+import DisplaySection from '@/components/layout/DisplaySection';
+import DisplaySegmented from '@/components/layout/DisplaySegmented';
import DisplaySettingsRow from '@/components/layout/DisplaySettingsRow';
-import DisplaySettingsSelect from '@/components/layout/DisplaySettingsSelect';
const SCALES: TimelineScale[] = ['week', 'month', 'quarter'];
-// The Display settings rows that only apply to the Timeline layout.
export default function DisplayTimelineRows({
settings,
onChange,
@@ -18,20 +17,14 @@ export default function DisplayTimelineRows({
const t = useTranslations('display.rows');
const scale = byKey(useTranslations('display.timelineScales'));
return (
- <>
- <DisplaySettingsRow label={t('startCollapsed')}>
- <Checkbox
- checked={settings.timelineCollapseAll}
- onCheckedChange={(checked) => onChange({ timelineCollapseAll: checked === true })}
- />
- </DisplaySettingsRow>
+ <DisplaySection>
<DisplaySettingsRow label={t('scale')}>
- <DisplaySettingsSelect
+ <DisplaySegmented
value={settings.timelineScale}
- onChange={(v) => onChange({ timelineScale: v as TimelineScale })}
+ onChange={(timelineScale) => onChange({ timelineScale })}
options={SCALES.map((value) => ({ value, label: scale(value) }))}
/>
</DisplaySettingsRow>
- </>
+ </DisplaySection>
);
}
diff --git a/apps/web/src/components/layout/DisplayToggleRow.tsx b/apps/web/src/components/layout/DisplayToggleRow.tsx
new file mode 100644
index 00000000..61a8d35e
--- /dev/null
+++ b/apps/web/src/components/layout/DisplayToggleRow.tsx
@@ -0,0 +1,19 @@
+import { Switch } from '@/components/ui/switch';
+
+// The whole row is the label of its switch, so a click anywhere on it toggles.
+export default function DisplayToggleRow({
+ label,
+ checked,
+ onCheckedChange,
+}: {
+ label: string;
+ checked: boolean;
+ onCheckedChange: (checked: boolean) => void;
+}) {
+ return (
+ <label className="flex min-h-8 cursor-pointer items-center justify-between gap-2 rounded-md px-2 text-sm text-muted-foreground transition-colors hover:bg-accent/60 hover:text-foreground">
+ {label}
+ <Switch checked={checked} onCheckedChange={onCheckedChange} />
+ </label>
+ );
+}
diff --git a/apps/web/src/components/layout/PropertyChip.tsx b/apps/web/src/components/layout/PropertyChip.tsx
index b81389d9..5efdd8c1 100644
--- a/apps/web/src/components/layout/PropertyChip.tsx
+++ b/apps/web/src/components/layout/PropertyChip.tsx
@@ -1,25 +1,37 @@
+import { useIconHover } from '@animateicons/react';
+import { CheckIcon } from '@animateicons/react/lucide/check-icon';
import { cn } from '@/lib/utils';
+import type { AnimatedIcon } from '@/lib/animatedIcon';
export default function PropertyChip({
label,
on,
onClick,
+ icon: Icon = CheckIcon,
+ iconClassName,
}: {
label: string;
on: boolean;
onClick: () => void;
+ // Shown before the label of a chip that is on.
+ icon?: AnimatedIcon;
+ iconClassName?: string;
}) {
+ const { ref, triggerProps } = useIconHover();
return (
<button
+ {...triggerProps}
type="button"
+ aria-pressed={on}
onClick={onClick}
className={cn(
- 'rounded-full border px-2 py-0.5 text-xs transition-colors',
+ 'inline-flex h-6 items-center gap-1 rounded-full px-2 text-xs transition-colors',
on
- ? 'border-primary bg-primary text-primary-foreground'
- : 'text-muted-foreground hover:bg-accent hover:text-foreground',
+ ? 'bg-secondary ps-1.5 font-medium text-foreground hover:bg-accent'
+ : 'text-muted-foreground ring-1 ring-border ring-inset hover:bg-accent hover:text-foreground',
)}
>
+ {on && <Icon ref={ref} size={12} className={iconClassName} />}
{label}
</button>
);
diff --git a/apps/web/src/components/layout/SortablePropertyChip.tsx b/apps/web/src/components/layout/SortablePropertyChip.tsx
index d1447efb..f4263c0a 100644
--- a/apps/web/src/components/layout/SortablePropertyChip.tsx
+++ b/apps/web/src/components/layout/SortablePropertyChip.tsx
@@ -1,7 +1,9 @@
+import { GripVerticalIcon } from '@animateicons/react/lucide/grip-vertical-icon';
import { useSortable } from '@dnd-kit/sortable';
import { CSS } from '@dnd-kit/utilities';
import { cn } from '@/lib/utils';
import type { PropertyKey } from '@/utils/viewSettings';
+import PropertyChip from '@/components/layout/PropertyChip';
// An enabled, draggable property chip. A drag reorders it (the sensors require a
// small move first, so a plain click still fires onClick to remove it). The drag
@@ -28,14 +30,15 @@ export default function SortablePropertyChip({
style={style}
{...attributes}
{...listeners}
- className={cn(
- 'flex cursor-grab items-center rounded-full border border-primary bg-primary text-xs text-primary-foreground transition-colors',
- isDragging && 'opacity-40',
- )}
+ className={cn('flex rounded-full *:cursor-grab', isDragging && 'opacity-40')}
>
- <button type="button" onClick={onClick} className="px-2 py-0.5">
- {label}
- </button>
+ <PropertyChip
+ label={label}
+ on
+ onClick={onClick}
+ icon={GripVerticalIcon}
+ iconClassName="text-muted-foreground"
+ />
</span>
);
}
diff --git a/apps/web/src/components/layout/ToolbarIconButton.tsx b/apps/web/src/components/layout/ToolbarIconButton.tsx
new file mode 100644
index 00000000..b3cc69fc
--- /dev/null
+++ b/apps/web/src/components/layout/ToolbarIconButton.tsx
@@ -0,0 +1,29 @@
+import type { ComponentProps } from 'react';
+import { useIconHover } from '@animateicons/react';
+import { cn } from '@/lib/utils';
+import type { AnimatedIcon } from '@/lib/animatedIcon';
+
+// Spreads the rest of its props on the button, so a Radix trigger can render it
+// through `asChild`.
+export default function ToolbarIconButton({
+ icon: Icon,
+ active = false,
+ className,
+ ...props
+}: ComponentProps<'button'> & { icon: AnimatedIcon; active?: boolean }) {
+ const { ref, triggerProps } = useIconHover();
+ return (
+ <button
+ type="button"
+ {...props}
+ {...triggerProps}
+ className={cn(
+ 'flex rounded-md p-1.5 hover:bg-accent hover:text-foreground',
+ active ? 'bg-accent text-foreground' : 'text-muted-foreground',
+ className,
+ )}
+ >
+ <Icon ref={ref} size={16} />
+ </button>
+ );
+}
diff --git a/apps/web/src/components/layout/ViewTabs.tsx b/apps/web/src/components/layout/ViewTabs.tsx
index 59d126a5..4178b4e2 100644
--- a/apps/web/src/components/layout/ViewTabs.tsx
+++ b/apps/web/src/components/layout/ViewTabs.tsx
@@ -7,7 +7,8 @@ import {
type DragStartEvent,
} from '@dnd-kit/core';
import { horizontalListSortingStrategy, SortableContext } from '@dnd-kit/sortable';
-import { Filter, Plus } from 'lucide-react';
+import { FilterIcon } from '@animateicons/react/lucide/filter-icon';
+import { Plus } from 'lucide-react';
import { useTranslations } from 'next-intl';
import type { View } from '@/lib/api/endpoints/views';
import { useDndSensors } from '@/lib/dnd';
@@ -15,6 +16,7 @@ import { usePermissions } from '@/hooks/usePermissions';
import AllViewTab, { ALL_DROP_ID } from '@/components/layout/AllViewTab';
import MobileViewSwitcher from '@/components/layout/MobileViewSwitcher';
import SavedViewTab from '@/components/layout/SavedViewTab';
+import ToolbarIconButton from '@/components/layout/ToolbarIconButton';
import ViewTabChrome from '@/components/layout/ViewTabChrome';
import ViewTabLabel from '@/components/layout/ViewTabLabel';
@@ -140,14 +142,7 @@ export default function ViewTabs({
</div>
<div className="flex shrink-0 items-center gap-0.5 pl-2">
- <button
- type="button"
- onClick={onToggleFilter}
- title={t('filter')}
- className="rounded-md p-1.5 text-muted-foreground hover:bg-accent hover:text-foreground"
- >
- <Filter className="size-4" />
- </button>
+ <ToolbarIconButton icon={FilterIcon} title={t('filter')} onClick={onToggleFilter} />
{displayControl}
</div>
</div>
diff --git a/apps/web/src/lib/animatedIcon.ts b/apps/web/src/lib/animatedIcon.ts
new file mode 100644
index 00000000..9bfc7855
--- /dev/null
+++ b/apps/web/src/lib/animatedIcon.ts
@@ -0,0 +1,10 @@
+import type { ComponentType, Ref } from 'react';
+import type { IconHandle } from '@animateicons/react';
+
+// An icon of @animateicons/react. The control it sits in plays it through the ref
+// that useIconHover hands out, so hovering anywhere on the control animates it.
+export type AnimatedIcon = ComponentType<{
+ size?: number;
+ className?: string;
+ ref?: Ref<IconHandle>;
+}>;
diff --git a/apps/web/src/utils/viewSettings.ts b/apps/web/src/utils/viewSettings.ts
index eaecaf24..82866084 100644
--- a/apps/web/src/utils/viewSettings.ts
+++ b/apps/web/src/utils/viewSettings.ts
@@ -133,9 +133,7 @@ export interface ViewSettings {
// Timeline row. Off by default — the relations are an extra load, and most
// boards do not use them.
showLinks: boolean;
- // The issues' subtasks, rendered the same way under their parent. Toggled by the
- // Nested subtasks chip in Display properties, and on the Timeline by a row of its
- // own.
+ // The issues' subtasks, rendered the same way under their parent.
showSubtasks: boolean;
// Whether a subtask also gets a card or row of its own next to the other issues.
// Independent of showSubtasks: with both on it shows in both places, with both
diff --git a/apps/web/src/utils/viewTypes.ts b/apps/web/src/utils/viewTypes.ts
index dcd6084e..5a3e6705 100644
--- a/apps/web/src/utils/viewTypes.ts
+++ b/apps/web/src/utils/viewTypes.ts
@@ -1,4 +1,8 @@
-import { CalendarDays, Columns3, GanttChart, Table2, type LucideIcon } from 'lucide-react';
+import { CalendarDaysIcon } from '@animateicons/react/lucide/calendar-days-icon';
+import { ChartGanttIcon } from '@animateicons/react/lucide/chart-gantt-icon';
+import { Columns3Icon } from '@animateicons/react/lucide/columns-3-icon';
+import { TableIcon } from '@animateicons/react/lucide/table-icon';
+import type { AnimatedIcon } from '@/lib/animatedIcon';
import type { HotkeyId } from '@/utils/hotkeys';
// Shared view-domain types used by both project.ts (sorting) and viewSettings.ts
@@ -34,11 +38,11 @@ export type WorkItemsView = 'kanban' | 'table' | 'timeline' | 'calendar';
// Each layout names its hotkey id rather than a key, so the switcher, the global
// key layer and the command palette all read the same binding (see lib/hotkeys).
// The name of a layout is a message under `display.layouts`.
-export const VIEWS: { value: WorkItemsView; icon: LucideIcon; hotkey: HotkeyId }[] = [
- { value: 'kanban', icon: Columns3, hotkey: 'view.kanban' },
- { value: 'table', icon: Table2, hotkey: 'view.table' },
- { value: 'timeline', icon: GanttChart, hotkey: 'view.timeline' },
- { value: 'calendar', icon: CalendarDays, hotkey: 'view.calendar' },
+export const VIEWS: { value: WorkItemsView; icon: AnimatedIcon; hotkey: HotkeyId }[] = [
+ { value: 'kanban', icon: Columns3Icon, hotkey: 'view.kanban' },
+ { value: 'table', icon: TableIcon, hotkey: 'view.table' },
+ { value: 'timeline', icon: ChartGanttIcon, hotkey: 'view.timeline' },
+ { value: 'calendar', icon: CalendarDaysIcon, hotkey: 'view.calendar' },
];
// Fields the project can be ordered by, in the order shown in the menu. The name
diff --git a/bun.lock b/bun.lock
index 174834d6..ac186e6f 100644
--- a/bun.lock
+++ b/bun.lock
@@ -74,6 +74,7 @@
"name": "web",
"version": "0.0.0",
"dependencies": {
+ "@animateicons/react": "^0.13.0",
"@base-ui/react": "^1.9.0",
"@better-auth/api-key": "1.7.11",
"@better-auth/oauth-provider": "1.7.11",
@@ -342,6 +343,8 @@
"@alloc/quick-lru": ["@alloc/[email protected]", "", {}, "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw=="],
+ "@animateicons/react": ["@animateicons/[email protected]", "", { "peerDependencies": { "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0" } }, "sha512-xbSymVZQJqUR1tcRVW4vyEy+USAFMDp0l3uM4nlmEyQazPib7Ay+PFKdBNLeXHXaSUGhKUYJXSvxHYkFki6P2w=="],
+
"@asamuzakjp/css-color": ["@asamuzakjp/[email protected]", "", { "dependencies": { "@csstools/css-calc": "^3.4.3", "@csstools/css-color-parser": "^4.2.6", "@csstools/css-parser-algorithms": "^4.0.2", "@csstools/css-tokenizer": "^4.0.2", "lru-cache": "^11.5.3" } }, "sha512-jCpAvj8apa7SKHZYogk0rbXB3Kb0hLFrpkWF+Ap+vBA5rirItnpv9NKyAyEuDuFizvl0qwnj6JWR70RGJ0rOlw=="],
"@asamuzakjp/dom-selector": ["@asamuzakjp/[email protected]", "", { "dependencies": { "bidi-js": "^1.1.0", "css-tree": "^3.2.1", "is-potential-custom-element-name": "^1.0.1", "lru-cache": "^11.5.3" } }, "sha512-A6f1nKy99I6tyoK82U6kBHvQQZmdHmTmPzJYPY/0eaOW0r8/qPmEOwjGHs+hL/vCgOwQTupu4LT1XtXNUuDruA=="],