mirror of
https://github.com/Memo-2023/mana-monorepo.git
synced 2026-05-14 20:01:09 +02:00
feat(calendar): add configurable ViewModePill for quick view switching
Add a View Mode Pill component next to the toolbar FAB that allows quick switching between calendar views. Users can configure which views appear in the quick switcher via right-click context menu. - Add ViewModePill component with icons for each view type - Add ViewModePillContextMenu for configuring visible views - Add quickViewPillViews setting (default: week, month, agenda) - Position pill to the left of the toolbar FAB 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
parent
b966c91c32
commit
0badca21ae
4 changed files with 329 additions and 0 deletions
|
|
@ -1,6 +1,7 @@
|
|||
<script lang="ts">
|
||||
import { ExpandableToolbar } from '@manacore/shared-ui';
|
||||
import CalendarToolbarContent from './CalendarToolbarContent.svelte';
|
||||
import ViewModePill from './ViewModePill.svelte';
|
||||
|
||||
interface Props {
|
||||
isSidebarMode?: boolean;
|
||||
|
|
@ -59,6 +60,11 @@
|
|||
{/snippet}
|
||||
</ExpandableToolbar>
|
||||
|
||||
<!-- View Mode Pill - positioned to the left of the FAB -->
|
||||
{#if !isSidebarMode}
|
||||
<ViewModePill {isSidebarMode} isToolbarExpanded={!isCollapsed} />
|
||||
{/if}
|
||||
|
||||
<style>
|
||||
/* Layout toggle button - app-specific style */
|
||||
.layout-btn {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,205 @@
|
|||
<script lang="ts">
|
||||
import { viewStore } from '$lib/stores/view.svelte';
|
||||
import { settingsStore } from '$lib/stores/settings.svelte';
|
||||
import type { CalendarViewType } from '@calendar/shared';
|
||||
import ViewModePillContextMenu from './ViewModePillContextMenu.svelte';
|
||||
|
||||
interface Props {
|
||||
isSidebarMode?: boolean;
|
||||
isToolbarExpanded?: boolean;
|
||||
}
|
||||
|
||||
let { isSidebarMode = false, isToolbarExpanded = false }: Props = $props();
|
||||
|
||||
let contextMenu: ViewModePillContextMenu;
|
||||
|
||||
function handleContextMenu(e: MouseEvent) {
|
||||
e.preventDefault();
|
||||
contextMenu?.show(e.clientX, e.clientY);
|
||||
}
|
||||
|
||||
function handleViewClick(view: CalendarViewType) {
|
||||
viewStore.setViewType(view);
|
||||
}
|
||||
|
||||
// View labels (short versions for pill)
|
||||
const viewLabels: Record<CalendarViewType, string> = {
|
||||
day: '1',
|
||||
'5day': '5',
|
||||
week: '7',
|
||||
'10day': '10',
|
||||
'14day': '14',
|
||||
month: 'M',
|
||||
year: 'Y',
|
||||
agenda: 'A',
|
||||
};
|
||||
|
||||
// View titles for tooltip
|
||||
const viewTitles: Record<CalendarViewType, string> = {
|
||||
day: 'Tagesansicht',
|
||||
'5day': '5-Tage-Ansicht',
|
||||
week: 'Wochenansicht',
|
||||
'10day': '10-Tage-Ansicht',
|
||||
'14day': '14-Tage-Ansicht',
|
||||
month: 'Monatsansicht',
|
||||
year: 'Jahresansicht',
|
||||
agenda: 'Agenda',
|
||||
};
|
||||
|
||||
// Get enabled views from settings
|
||||
let enabledViews = $derived(settingsStore.quickViewPillViews);
|
||||
</script>
|
||||
|
||||
<!-- svelte-ignore a11y_no_static_element_interactions -->
|
||||
<div
|
||||
class="view-mode-pill"
|
||||
class:sidebar-mode={isSidebarMode}
|
||||
class:toolbar-expanded={isToolbarExpanded}
|
||||
oncontextmenu={handleContextMenu}
|
||||
>
|
||||
{#each enabledViews as view}
|
||||
<button
|
||||
type="button"
|
||||
class="view-btn"
|
||||
class:active={viewStore.viewType === view}
|
||||
onclick={() => handleViewClick(view)}
|
||||
title={viewTitles[view]}
|
||||
>
|
||||
{#if view === 'day'}
|
||||
<svg fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<rect x="6" y="4" width="12" height="16" rx="2" stroke-width="2" />
|
||||
<path stroke-linecap="round" stroke-width="2" d="M6 8h12" />
|
||||
</svg>
|
||||
{:else if view === '5day' || view === 'week'}
|
||||
<svg fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
{#if view === '5day'}
|
||||
<path
|
||||
stroke-linecap="round"
|
||||
stroke-width="2"
|
||||
d="M5 4v16M9 4v16M13 4v16M17 4v16M21 4v16"
|
||||
/>
|
||||
{:else}
|
||||
<path
|
||||
stroke-linecap="round"
|
||||
stroke-width="2"
|
||||
d="M3 4v16M6.5 4v16M10 4v16M13.5 4v16M17 4v16M20.5 4v16M24 4v16"
|
||||
/>
|
||||
{/if}
|
||||
</svg>
|
||||
{:else if view === '10day' || view === '14day'}
|
||||
<span class="view-text">{viewLabels[view]}</span>
|
||||
{:else if view === 'month'}
|
||||
<svg fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<rect x="3" y="4" width="18" height="16" rx="2" stroke-width="2" />
|
||||
<path stroke-linecap="round" stroke-width="2" d="M3 9h18M8 4v4M16 4v4" />
|
||||
<path
|
||||
stroke-linecap="round"
|
||||
stroke-width="1.5"
|
||||
d="M7 13h2M11 13h2M15 13h2M7 17h2M11 17h2"
|
||||
/>
|
||||
</svg>
|
||||
{:else if view === 'year'}
|
||||
<svg fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<rect x="2" y="2" width="4" height="4" rx="0.5" stroke-width="1.5" />
|
||||
<rect x="7.5" y="2" width="4" height="4" rx="0.5" stroke-width="1.5" />
|
||||
<rect x="13" y="2" width="4" height="4" rx="0.5" stroke-width="1.5" />
|
||||
<rect x="18.5" y="2" width="4" height="4" rx="0.5" stroke-width="1.5" />
|
||||
<rect x="2" y="8" width="4" height="4" rx="0.5" stroke-width="1.5" />
|
||||
<rect x="7.5" y="8" width="4" height="4" rx="0.5" stroke-width="1.5" />
|
||||
<rect x="13" y="8" width="4" height="4" rx="0.5" stroke-width="1.5" />
|
||||
<rect x="18.5" y="8" width="4" height="4" rx="0.5" stroke-width="1.5" />
|
||||
<rect x="2" y="14" width="4" height="4" rx="0.5" stroke-width="1.5" />
|
||||
<rect x="7.5" y="14" width="4" height="4" rx="0.5" stroke-width="1.5" />
|
||||
<rect x="13" y="14" width="4" height="4" rx="0.5" stroke-width="1.5" />
|
||||
<rect x="18.5" y="14" width="4" height="4" rx="0.5" stroke-width="1.5" />
|
||||
</svg>
|
||||
{:else if view === 'agenda'}
|
||||
<svg fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h12" />
|
||||
</svg>
|
||||
{/if}
|
||||
</button>
|
||||
{/each}
|
||||
</div>
|
||||
|
||||
<ViewModePillContextMenu bind:this={contextMenu} />
|
||||
|
||||
<style>
|
||||
.view-mode-pill {
|
||||
position: fixed;
|
||||
/* Same vertical alignment as FAB */
|
||||
bottom: calc(70px + 9px + env(safe-area-inset-bottom, 0px));
|
||||
/* Position left of the Toolbar FAB (which is at right: calc(50% - 350px - 70px)) */
|
||||
/* FAB position + FAB width (54px) + gap (8px) = left of FAB */
|
||||
right: calc(50% - 350px - 70px + 54px + 8px);
|
||||
z-index: 91;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.125rem;
|
||||
padding: 0.375rem;
|
||||
background: hsl(var(--color-surface) / 0.85);
|
||||
backdrop-filter: blur(12px);
|
||||
-webkit-backdrop-filter: blur(12px);
|
||||
border: 1px solid hsl(var(--color-border));
|
||||
border-radius: 9999px;
|
||||
box-shadow: 0 2px 8px hsl(var(--color-foreground) / 0.08);
|
||||
transition: bottom 0.2s ease;
|
||||
}
|
||||
|
||||
/* When toolbar is expanded, move pill up */
|
||||
.view-mode-pill.toolbar-expanded {
|
||||
bottom: calc(140px + 9px + env(safe-area-inset-bottom, 0px));
|
||||
}
|
||||
|
||||
/* Sidebar mode positioning */
|
||||
.view-mode-pill.sidebar-mode {
|
||||
bottom: calc(9px + env(safe-area-inset-bottom, 0px));
|
||||
right: calc(50% - 350px - 70px + 54px + 8px);
|
||||
}
|
||||
|
||||
.view-mode-pill.sidebar-mode.toolbar-expanded {
|
||||
bottom: calc(70px + 9px + env(safe-area-inset-bottom, 0px));
|
||||
}
|
||||
|
||||
/* Responsive - on smaller screens, FAB is at right: 1rem */
|
||||
@media (max-width: 900px) {
|
||||
.view-mode-pill {
|
||||
right: calc(1rem + 54px + 8px);
|
||||
}
|
||||
}
|
||||
|
||||
.view-btn {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 2rem;
|
||||
height: 2rem;
|
||||
padding: 0.375rem;
|
||||
background: transparent;
|
||||
border: none;
|
||||
border-radius: 9999px;
|
||||
cursor: pointer;
|
||||
color: hsl(var(--color-muted-foreground));
|
||||
transition: all 0.15s ease;
|
||||
}
|
||||
|
||||
.view-btn:hover {
|
||||
background: hsl(var(--color-muted) / 0.5);
|
||||
color: hsl(var(--color-foreground));
|
||||
}
|
||||
|
||||
.view-btn.active {
|
||||
background: color-mix(in srgb, #3b82f6 15%, transparent 85%);
|
||||
color: #3b82f6;
|
||||
}
|
||||
|
||||
.view-btn :global(svg) {
|
||||
width: 1.125rem;
|
||||
height: 1.125rem;
|
||||
}
|
||||
|
||||
.view-text {
|
||||
font-size: 0.75rem;
|
||||
font-weight: 600;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -0,0 +1,104 @@
|
|||
<script lang="ts">
|
||||
import { ContextMenu, type ContextMenuItem } from '@manacore/shared-ui';
|
||||
import { Calendar, ListBullets, GridFour, CalendarBlank } from '@manacore/shared-icons';
|
||||
import { settingsStore } from '$lib/stores/settings.svelte';
|
||||
import type { CalendarViewType } from '@calendar/shared';
|
||||
|
||||
// Context menu state
|
||||
let visible = $state(false);
|
||||
let x = $state(0);
|
||||
let y = $state(0);
|
||||
|
||||
// View labels
|
||||
const viewLabels: Record<CalendarViewType, string> = {
|
||||
day: 'Tag',
|
||||
'5day': '5 Tage',
|
||||
week: 'Woche',
|
||||
'10day': '10 Tage',
|
||||
'14day': '14 Tage',
|
||||
month: 'Monat',
|
||||
year: 'Jahr',
|
||||
agenda: 'Agenda',
|
||||
};
|
||||
|
||||
// All available views
|
||||
const allViews: CalendarViewType[] = [
|
||||
'day',
|
||||
'5day',
|
||||
'week',
|
||||
'10day',
|
||||
'14day',
|
||||
'month',
|
||||
'year',
|
||||
'agenda',
|
||||
];
|
||||
|
||||
function isViewEnabled(view: CalendarViewType): boolean {
|
||||
return settingsStore.quickViewPillViews.includes(view);
|
||||
}
|
||||
|
||||
function toggleView(view: CalendarViewType) {
|
||||
const current = settingsStore.quickViewPillViews;
|
||||
if (current.includes(view)) {
|
||||
// Remove view (but keep at least one)
|
||||
if (current.length > 1) {
|
||||
settingsStore.set(
|
||||
'quickViewPillViews',
|
||||
current.filter((v) => v !== view)
|
||||
);
|
||||
}
|
||||
} else {
|
||||
// Add view
|
||||
settingsStore.set('quickViewPillViews', [...current, view]);
|
||||
}
|
||||
}
|
||||
|
||||
// Build menu items
|
||||
let menuItems = $derived.by((): ContextMenuItem[] => {
|
||||
return allViews.map((view) => ({
|
||||
id: view,
|
||||
label: viewLabels[view],
|
||||
icon: getViewIcon(view),
|
||||
toggle: true,
|
||||
checked: isViewEnabled(view),
|
||||
action: () => toggleView(view),
|
||||
}));
|
||||
});
|
||||
|
||||
// Get appropriate icon for view type
|
||||
function getViewIcon(view: CalendarViewType) {
|
||||
switch (view) {
|
||||
case 'day':
|
||||
case '5day':
|
||||
case '10day':
|
||||
case '14day':
|
||||
return CalendarBlank;
|
||||
case 'week':
|
||||
return Calendar;
|
||||
case 'month':
|
||||
case 'year':
|
||||
return GridFour;
|
||||
case 'agenda':
|
||||
return ListBullets;
|
||||
default:
|
||||
return Calendar;
|
||||
}
|
||||
}
|
||||
|
||||
function handleClose() {
|
||||
visible = false;
|
||||
}
|
||||
|
||||
// Export show function to be called from parent
|
||||
export function show(clientX: number, clientY: number) {
|
||||
x = clientX;
|
||||
y = clientY;
|
||||
visible = true;
|
||||
}
|
||||
|
||||
export function hide() {
|
||||
visible = false;
|
||||
}
|
||||
</script>
|
||||
|
||||
<ContextMenu {visible} {x} {y} items={menuItems} onClose={handleClose} />
|
||||
|
|
@ -34,6 +34,7 @@ export interface CalendarAppSettings {
|
|||
dateStripShowMonthDividers: boolean; // Show vertical dividers between months
|
||||
dateStripCompact: boolean; // Use compact/smaller DateStrip
|
||||
dateStripShowWeekNumbers: boolean; // Show week numbers at start of week
|
||||
dateStripCollapsed: boolean; // Whether DateStrip is minimized to FAB
|
||||
|
||||
// Birthday settings (cross-app integration with Contacts)
|
||||
showBirthdays: boolean; // Show contact birthdays in calendar
|
||||
|
|
@ -42,6 +43,9 @@ export interface CalendarAppSettings {
|
|||
// UI settings
|
||||
sidebarCollapsed: boolean;
|
||||
|
||||
// Quick View Pill settings
|
||||
quickViewPillViews: CalendarViewType[]; // Views shown in quick switcher
|
||||
|
||||
// Event defaults
|
||||
defaultEventDuration: number; // in minutes
|
||||
defaultReminder: number; // in minutes before event
|
||||
|
|
@ -65,11 +69,15 @@ const DEFAULT_SETTINGS: CalendarAppSettings = {
|
|||
dateStripShowMonthDividers: true,
|
||||
dateStripCompact: false,
|
||||
dateStripShowWeekNumbers: false,
|
||||
dateStripCollapsed: false,
|
||||
// Birthday defaults
|
||||
showBirthdays: true,
|
||||
showBirthdayAge: true,
|
||||
// UI defaults
|
||||
sidebarCollapsed: false,
|
||||
// Quick View Pill defaults
|
||||
quickViewPillViews: ['week', 'month', 'agenda'],
|
||||
// Event defaults
|
||||
defaultEventDuration: 60,
|
||||
defaultReminder: 15,
|
||||
};
|
||||
|
|
@ -189,6 +197,9 @@ export const settingsStore = {
|
|||
get dateStripShowWeekNumbers() {
|
||||
return settings.dateStripShowWeekNumbers;
|
||||
},
|
||||
get dateStripCollapsed() {
|
||||
return settings.dateStripCollapsed;
|
||||
},
|
||||
// Birthday settings
|
||||
get showBirthdays() {
|
||||
return settings.showBirthdays;
|
||||
|
|
@ -205,6 +216,9 @@ export const settingsStore = {
|
|||
get sidebarCollapsed() {
|
||||
return settings.sidebarCollapsed;
|
||||
},
|
||||
get quickViewPillViews() {
|
||||
return settings.quickViewPillViews;
|
||||
},
|
||||
get cloudSyncEnabled() {
|
||||
return cloudSyncEnabled;
|
||||
},
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue