From e195214a1f6abcc86f0b8b499f231a01ca759c28 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 10 Aug 2025 04:03:33 +0000
Subject: [PATCH 1/7] Initial plan
From 172131f19333f198b06a88e7fbeed6b6939b5a06 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 10 Aug 2025 04:30:11 +0000
Subject: [PATCH 2/7] Fix DST timezone selection issues - add "+" buttons to
search results and expand modal behavior
Co-authored-by: tsmarvin <57049894+tsmarvin@users.noreply.github.com>
---
src/scripts/index.ts | 104 ++++++++++++++++++++++++++++--
src/styles/styles.css | 144 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 243 insertions(+), 5 deletions(-)
diff --git a/src/scripts/index.ts b/src/scripts/index.ts
index eb399a8..1bdae43 100644
--- a/src/scripts/index.ts
+++ b/src/scripts/index.ts
@@ -2226,11 +2226,8 @@ export class TimezoneModal {
if (plusBtn && group.alternate) {
plusBtn.addEventListener('click', e => {
e.stopPropagation();
- // Select the alternate timezone directly and mark as off-cycle
- if (this.onTimezoneSelectedCallback && group.alternate) {
- this.onTimezoneSelectedCallback(group.alternate, true); // Mark alternate as off-cycle
- }
- this.close();
+ // Expand to show both timezone options instead of directly adding alternate
+ this.showTimezoneOptions(group);
});
}
@@ -2293,13 +2290,30 @@ export class TimezoneModal {
? `${timezone.cityName} (${timezone.abbreviation})`
: `${timezone.cityName} (${timezone.abbreviation} ${offsetStr})`;
+ // Check if this timezone has an alternate available (for DST support in search results)
+ const matchingGroup = this.groupedTimezonesLookup.get(timezone.iana);
+ const hasAlternate = matchingGroup && matchingGroup.alternate;
+
item.innerHTML = `
${displayText}
+ ${hasAlternate ? '+' : ''}
${timezone.displayName}
`;
+ // Handle plus button clicks (for search results)
+ if (hasAlternate) {
+ const plusBtn = item.querySelector('.timezone-plus-btn');
+ if (plusBtn && matchingGroup && matchingGroup.alternate) {
+ plusBtn.addEventListener('click', e => {
+ e.stopPropagation();
+ // Expand to show both timezone options instead of directly adding alternate
+ this.showTimezoneOptions(matchingGroup);
+ });
+ }
+ }
+
// Click handler
item.addEventListener('click', () => {
if (!isCenter) {
@@ -2369,6 +2383,86 @@ export class TimezoneModal {
document.body.style.overflow = '';
}
+ /**
+ * Show expanded view with both timezone options for selection
+ */
+ private showTimezoneOptions(group: GroupedTimezone): void {
+ // Clear wheel and show both timezone options
+ this.wheel.innerHTML = '';
+
+ const optionsContainer = document.createElement('div');
+ optionsContainer.className = 'timezone-options-container';
+ optionsContainer.innerHTML = `
+
+
+
+
+
+
+ `;
+
+ const optionsList = optionsContainer.querySelector('.timezone-options-list') as HTMLElement;
+
+ // Add current timezone option
+ const currentOption = document.createElement('div');
+ currentOption.className = 'timezone-option current-option';
+ currentOption.innerHTML = `
+
+
+
${formatOffset(group.current.offset)}
+
${group.current.displayName}
+
+
${formatOffset(group.alternate.offset)}
+
${group.alternate.displayName}
+