From 7ed6fd9b299f37c20a10a4158047e7c253d9f94d Mon Sep 17 00:00:00 2001
From: Leo Vasanko <leo@git>
Date: Mon, 25 Aug 2025 10:59:08 -0600
Subject: [PATCH] Settings dialog inside the settings button.

---
 src/components/BaseDialog.vue     | 90 ++++++++++++++++++++++++++-----
 src/components/CalendarView.vue   |  9 +---
 src/components/HeaderControls.vue | 13 ++++-
 src/components/SettingsDialog.vue |  8 ---
 4 files changed, 89 insertions(+), 31 deletions(-)

diff --git a/src/components/BaseDialog.vue b/src/components/BaseDialog.vue
index 904306c..cb12888 100644
--- a/src/components/BaseDialog.vue
+++ b/src/components/BaseDialog.vue
@@ -11,12 +11,18 @@ const props = defineProps({
 const emit = defineEmits(['update:modelValue', 'opened', 'closed', 'submit'])
 
 const modalRef = ref(null)
+const anchorRef = ref(null)
 const isDragging = ref(false)
 const dragOffset = ref({ x: 0, y: 0 })
 const modalPosition = ref({ x: 0, y: 0 })
 const dialogWidth = ref(null)
 const dialogHeight = ref(null)
 const hasMoved = ref(false)
+const margin = 8 // viewport margin in px to keep dialog from touching edges
+
+function clamp(val, min, max) {
+  return Math.min(Math.max(val, min), max)
+}
 
 function startDrag(event) {
   if (!props.draggable || !modalRef.value) return
@@ -41,10 +47,15 @@ function startDrag(event) {
 }
 function handleDrag(event) {
   if (!isDragging.value) return
-  modalPosition.value = {
-    x: event.clientX - dragOffset.value.x,
-    y: event.clientY - dragOffset.value.y,
-  }
+  let x = event.clientX - dragOffset.value.x
+  let y = event.clientY - dragOffset.value.y
+  const w = dialogWidth.value || modalRef.value?.offsetWidth || 0
+  const h = dialogHeight.value || modalRef.value?.offsetHeight || 0
+  const vw = window.innerWidth
+  const vh = window.innerHeight
+  x = clamp(x, margin, Math.max(margin, vw - w - margin))
+  y = clamp(y, margin, Math.max(margin, vh - h - margin))
+  modalPosition.value = { x, y }
   event.preventDefault()
 }
 function stopDrag() {
@@ -55,16 +66,20 @@ function stopDrag() {
 }
 
 const modalStyle = computed(() => {
-  if (hasMoved.value) {
-    return {
+  // Always position relative to calculated modalPosition once opened
+  if (modalRef.value && props.modelValue) {
+    const style = {
       transform: 'none',
-      left: `${modalPosition.value.x}px`,
-      top: `${modalPosition.value.y}px`,
+      left: modalPosition.value.x + 'px',
+      top: modalPosition.value.y + 'px',
       bottom: 'auto',
       right: 'auto',
-      width: dialogWidth.value ? dialogWidth.value + 'px' : undefined,
-      height: dialogHeight.value ? dialogHeight.value + 'px' : undefined,
     }
+    if (hasMoved.value) {
+      style.width = dialogWidth.value ? dialogWidth.value + 'px' : undefined
+      style.height = dialogHeight.value ? dialogHeight.value + 'px' : undefined
+    }
+    return style
   }
   return {}
 })
@@ -81,12 +96,34 @@ function handleKeydown(e) {
 onMounted(() => document.addEventListener('keydown', handleKeydown))
 onUnmounted(() => document.removeEventListener('keydown', handleKeydown))
 
+function positionNearAnchor() {
+  if (!anchorRef.value) return
+  const rect = anchorRef.value.getBoundingClientRect()
+  // Place dialog below anchor with small vertical offset
+  const offsetY = 8
+  // Need dialog dimensions to clamp correctly; measure current or fallback estimates
+  const w = modalRef.value?.offsetWidth || dialogWidth.value || 320
+  const h = modalRef.value?.offsetHeight || dialogHeight.value || 200
+  const vw = window.innerWidth
+  const vh = window.innerHeight
+  let x = rect.left
+  let y = rect.bottom + offsetY
+  x = clamp(x, margin, Math.max(margin, vw - w - margin))
+  y = clamp(y, margin, Math.max(margin, vh - h - margin))
+  modalPosition.value = { x, y }
+}
+
 watch(
   () => props.modelValue,
   async (v) => {
     if (v) {
       emit('opened')
       await nextTick()
+      // Reset movement state each time opened
+      hasMoved.value = false
+      dialogWidth.value = null
+      dialogHeight.value = null
+      positionNearAnchor()
       if (props.autoFocus) {
         const el = modalRef.value?.querySelector('[autofocus]')
         if (el) el.focus()
@@ -94,9 +131,33 @@ watch(
     }
   },
 )
+
+function handleResize() {
+  if (!props.modelValue) return
+  // Re-clamp current position, and if not moved recalc near anchor
+  if (!hasMoved.value) positionNearAnchor()
+  else if (modalRef.value) {
+    const w = modalRef.value.offsetWidth
+    const h = modalRef.value.offsetHeight
+    const vw = window.innerWidth
+    const vh = window.innerHeight
+    modalPosition.value = {
+      x: clamp(modalPosition.value.x, margin, Math.max(margin, vw - w - margin)),
+      y: clamp(modalPosition.value.y, margin, Math.max(margin, vh - h - margin)),
+    }
+  }
+}
+
+onMounted(() => {
+  window.addEventListener('resize', handleResize)
+})
+onUnmounted(() => {
+  window.removeEventListener('resize', handleResize)
+})
 </script>
 
 <template>
+  <span ref="anchorRef" class="ec-modal-anchor" aria-hidden="true"></span>
   <div v-if="modelValue" class="ec-modal" ref="modalRef" :style="modalStyle">
     <form class="ec-form" @submit.prevent="emit('submit')">
       <header class="ec-header" @pointerdown="startDrag">
@@ -117,9 +178,7 @@ watch(
 
 <style scoped>
 .ec-modal {
-  position: fixed;
-  bottom: 3em;
-  right: 2em;
+  position: fixed; /* still fixed for overlay & dragging, but now top/left are set dynamically */
   background: color-mix(in srgb, var(--panel) 85%, transparent);
   backdrop-filter: blur(0.625em);
   -webkit-backdrop-filter: blur(0.625em);
@@ -133,6 +192,11 @@ watch(
   z-index: 1000;
   overflow: hidden;
 }
+.ec-modal-anchor {
+  display: inline-block;
+  width: 0;
+  height: 0;
+}
 .ec-form {
   display: grid;
   grid-template-rows: auto 1fr auto;
diff --git a/src/components/CalendarView.vue b/src/components/CalendarView.vue
index 861c056..1f84273 100644
--- a/src/components/CalendarView.vue
+++ b/src/components/CalendarView.vue
@@ -5,7 +5,6 @@ import CalendarHeader from '@/components/CalendarHeader.vue'
 import CalendarWeek from '@/components/CalendarWeek.vue'
 import HeaderControls from '@/components/HeaderControls.vue'
 import Jogwheel from '@/components/Jogwheel.vue'
-import SettingsDialog from '@/components/SettingsDialog.vue'
 import {
   getLocalizedMonthName,
   monthAbbr,
@@ -26,7 +25,6 @@ import { getHolidayForDate } from '@/utils/holidays'
 
 const calendarStore = useCalendarStore()
 const viewport = ref(null)
-const settingsDialog = ref(null)
 
 const emit = defineEmits(['create-event', 'edit-event'])
 
@@ -645,9 +643,6 @@ const handleHeaderYearChange = ({ scrollTop: st }) => {
   viewport.value && (viewport.value.scrollTop = clamped)
 }
 
-function openSettings() {
-  settingsDialog.value?.open()
-}
 // Heuristic: rotate month label (180deg) only for predominantly Latin text.
 // We explicitly avoid locale detection; rely solely on characters present.
 // Disable rotation if any CJK Unified Ideograph or Compatibility Ideograph appears.
@@ -687,8 +682,7 @@ window.addEventListener('resize', () => {
 <template>
   <div ref="rowProbe" class="row-height-probe" aria-hidden="true"></div>
   <div class="wrap">
-    <HeaderControls @go-to-today="goToToday" @open-settings="openSettings" />
-
+    <HeaderControls @go-to-today="goToToday" />
     <CalendarHeader
       :scroll-top="scrollTop"
       :row-height="rowHeight"
@@ -720,7 +714,6 @@ window.addEventListener('resize', () => {
         @scroll-to="handleJogwheelScrollTo"
       />
     </div>
-    <SettingsDialog ref="settingsDialog" />
   </div>
 </template>
 
diff --git a/src/components/HeaderControls.vue b/src/components/HeaderControls.vue
index 0ad1f6f..e61a373 100644
--- a/src/components/HeaderControls.vue
+++ b/src/components/HeaderControls.vue
@@ -25,12 +25,14 @@
       <button
         type="button"
         class="settings-btn"
-        @click="$emit('open-settings')"
+        @click="openSettings"
         aria-label="Open settings"
         title="Settings"
       >
         ⚙
       </button>
+      <!-- Settings dialog now lives here -->
+      <SettingsDialog ref="settingsDialog" />
     </div>
   </Transition>
   <button
@@ -48,6 +50,7 @@
 import { computed, ref, onMounted, onBeforeUnmount } from 'vue'
 import { useCalendarStore } from '@/stores/CalendarStore'
 import { formatTodayString } from '@/utils/date'
+import SettingsDialog from '@/components/SettingsDialog.vue'
 
 const calendarStore = useCalendarStore()
 
@@ -56,7 +59,7 @@ const todayString = computed(() => {
   return formatTodayString(d)
 })
 
-const emit = defineEmits(['open-settings', 'go-to-today'])
+const emit = defineEmits(['go-to-today'])
 
 function goToToday() {
   // Emit the event so the parent can handle the viewport scrolling logic
@@ -77,6 +80,12 @@ function toggleVisibility() {
   isVisible.value = !isVisible.value
 }
 
+// Settings dialog integration
+const settingsDialog = ref(null)
+function openSettings() {
+  settingsDialog.value?.open()
+}
+
 onMounted(() => {
   checkScreenSize()
   window.addEventListener('resize', checkScreenSize)
diff --git a/src/components/SettingsDialog.vue b/src/components/SettingsDialog.vue
index 279ebdc..78c6cb2 100644
--- a/src/components/SettingsDialog.vue
+++ b/src/components/SettingsDialog.vue
@@ -306,12 +306,4 @@ select {
 .ec-btn.delete-btn:hover {
   background: hsl(0, 70%, 45%);
 }
-/* Global override to ensure settings dialog appears near top by default */
-.ec-modal.settings-modal {
-  top: 4.5rem !important;
-  right: 2rem !important;
-  bottom: auto !important;
-  left: auto !important;
-  transform: none !important;
-}
 </style>