@reliability-design/web 1.4.3 → 1.4.5

package/dist/components/rel-time-picker/rel-time-picker.ts

@@ -3,7 +3,7 @@ import { customElement, property, state, query } from "lit/decorators.js";
 import "@reliability-design/icons/rel-icon";
 import "../rel-button/rel-button";
 
-type TimeColumn = "hour" | "minute" | "period";
+type TimeColumn = "hour" | "minute" | "second" | "period";
 
 /**
  * `<rel-time-picker>` — time selection field.
@@ -13,12 +13,18 @@ type TimeColumn = "hour" | "minute" | "period";
  * column selections are held in draft state until Apply is clicked; Cancel,
  * Escape, or an outside click discards the draft.
  *
- * The committed `value` is ALWAYS 24-hour "HH:mm" regardless of the display
- * `format`, so consumers get a consistent machine-readable string.
+ * The committed `value` is ALWAYS 24-hour "HH:mm" (or "HH:mm:ss" when
+ * `seconds` is enabled) regardless of the display `format`, so consumers get
+ * a consistent machine-readable string.
+ *
+ * Panel visuals follow the Figma "Time Picker" component (Reliability DS
+ * V1.0, node 8301:3771): fixed panel widths 220/250/280 by size, full-bleed
+ * columns with 1px dividers, neutral selected state, and a Now / Cancel / OK
+ * footer whose buttons are always size S.
  */
 @customElement("rel-time-picker")
 export class RelTimePicker extends LitElement {
-  /** Committed time, 24-hour "HH:mm" (e.g. "09:30", "17:05"). */
+  /** Committed time, 24-hour "HH:mm" or "HH:mm:ss" (e.g. "09:30", "17:05:30"). */
   @property({ type: String, reflect: true }) value: string | null = null;
   @property({ type: String }) placeholder = "Select time";
   @property({ type: String }) label: string | null = null;
@@ -26,10 +32,12 @@ export class RelTimePicker extends LitElement {
   @property({ type: Boolean }) required = false;
   @property({ type: Boolean, reflect: true }) readonly = false;
 
-  /** Display format of the trigger text and hour column. Value stays "HH:mm". */
+  /** Display format of the trigger text and hour column. Value stays 24-hour. */
   @property({ type: String }) format: "12h" | "24h" = "12h";
+  /** Shows the seconds column; committed value becomes "HH:mm:ss". */
+  @property({ type: Boolean, reflect: true }) seconds = false;
   /** Minute granularity of the minutes column (1, 5, 10, 15, 30, …). */
-  @property({ type: Number, attribute: "minute-step" }) minuteStep = 1;
+  @property({ type: Number, attribute: "minute-step" }) minuteStep = 5;
 
   /** Earliest selectable time, "HH:mm" (inclusive). */
   @property({ type: String, attribute: "min-time" }) minTime: string | null = null;
@@ -50,9 +58,12 @@ export class RelTimePicker extends LitElement {
   @property({ type: String, reflect: true }) variant: "outlined" = "outlined";
   @property({ type: Boolean, reflect: true }) fullWidth = false;
 
-  // Draft selection (hour is 0–23 internally; committed on Apply only)
+  // Draft selection (hour is 0–23 internally; committed on OK only)
   @state() private draftHour: number | null = null;
   @state() private draftMinute: number | null = null;
+  @state() private draftSecond: number | null = null;
+  /** Panel opens above the field when there is no viewport space below. */
+  @state() private openUp = false;
 
   @query(".trigger-button") private triggerButton?: HTMLButtonElement;
   @query(".columns") private columnsElement?: HTMLElement;
@@ -224,16 +235,19 @@ export class RelTimePicker extends LitElement {
       height: 16px;
     }
 
+    /* Panel (Figma "Time Picker"): fixed width per size, full-bleed content. */
     .popover {
       position: absolute;
       top: calc(100% + 4px);
       left: 0;
       z-index: 1000;
       background: var(--rel-bg-surface);
-      border: 1px solid var(--rel-border-default);
+      border: 1px solid var(--rel-border-subtle);
       border-radius: var(--rel-border-radius-sm);
       box-shadow: var(--rel-shadows-shadow-300);
-      padding: var(--rel-spacing-md);
+      overflow: hidden;
+      min-width: 220px;
+      width: 250px;
       display: none;
     }
 
@@ -241,94 +255,79 @@ export class RelTimePicker extends LitElement {
       display: block;
     }
 
-    /* Draft readout (mirrors the range-picker FROM/TO block) */
-    .time-readout {
-      display: flex;
-      align-items: baseline;
-      gap: var(--rel-spacing-sm);
-      padding-bottom: var(--rel-spacing-sm);
-      margin-bottom: var(--rel-spacing-sm);
-      border-bottom: 1px solid var(--rel-border-subtle);
-    }
-
-    .time-readout-label {
-      color: var(--rel-text-placeholder);
-      text-transform: uppercase;
-      font-family: var(--rel-body-xs-semibold-font-family);
-      font-weight: var(--rel-body-xs-semibold-font-weight);
-      font-size: var(--rel-body-xs-semibold-font-size);
-      line-height: var(--rel-body-xs-semibold-line-height);
-      letter-spacing: var(--rel-body-xs-semibold-letter-spacing);
-    }
-
-    .time-readout-value {
-      color: var(--rel-text-default);
-      font-family: var(--rel-body-md-semibold-font-family);
-      font-weight: var(--rel-body-md-semibold-font-weight);
-      font-size: var(--rel-body-md-semibold-font-size);
-      line-height: var(--rel-body-md-semibold-line-height);
-      letter-spacing: var(--rel-body-md-semibold-letter-spacing);
-    }
-
-    .time-readout-value.empty {
-      color: var(--rel-text-placeholder);
+    /* Flip above the field when the viewport has no room below. */
+    .popover.open-up {
+      top: auto;
+      bottom: calc(100% + 4px);
     }
 
+    /* Full-bleed column row with 1px dividers (Figma "Columns"). */
     .columns {
       display: flex;
-      gap: var(--rel-spacing-xs);
+      align-items: stretch;
+      height: 260px;
     }
 
-    /* Columns share the panel width equally, so the two-column 24h layout
-       fills the same footprint the footer dictates instead of bunching left. */
-    .column {
-      display: flex;
-      flex-direction: column;
-      flex: 1;
-      min-width: 64px;
-    }
-
-    .column-header {
-      text-align: center;
-      color: var(--rel-text-placeholder);
-      padding: var(--rel-spacing-xs);
-      text-transform: uppercase;
-      font-family: var(--rel-body-xs-semibold-font-family);
-      font-weight: var(--rel-body-xs-semibold-font-weight);
-      font-size: var(--rel-body-xs-semibold-font-size);
-      line-height: var(--rel-body-xs-semibold-line-height);
-      letter-spacing: var(--rel-body-xs-semibold-letter-spacing);
+    .column-divider {
+      flex-shrink: 0;
+      width: 1px;
+      background: var(--rel-border-subtle);
     }
 
+    /* Each column scrolls independently. The 4px rail is always reserved
+       (scrollbar-gutter) so columns stay aligned whether or not they
+       overflow; the thumb only appears on overflow. */
     .column-list {
+      flex: 1;
+      min-width: 0;
       display: flex;
       flex-direction: column;
-      gap: var(--rel-spacing-3xs);
-      max-height: 224px;
+      /* Positioned so option offsetTop is list-relative — the in-column
+         scroll math depends on it (we never scrollIntoView: it scrolls every
+         ancestor, page included). */
+      position: relative;
       overflow-y: auto;
-      padding: var(--rel-spacing-3xs);
+      padding: var(--rel-spacing-2xs);
       scrollbar-width: thin;
+      scrollbar-color: var(--rel-border-default) transparent;
+      scrollbar-gutter: stable;
     }
 
+    .column-list::-webkit-scrollbar {
+      width: 4px;
+    }
+
+    .column-list::-webkit-scrollbar-track {
+      background: transparent;
+    }
+
+    .column-list::-webkit-scrollbar-thumb {
+      background: var(--rel-border-default);
+      border-radius: var(--rel-border-radius-full-rounded);
+    }
+
+    /* Option cell (Figma ".Time Option"): selected uses the neutral
+       elevated-2 fill + medium weight, NOT the brand color. */
     .option-button {
       border: none;
       background: transparent;
-      border-radius: var(--rel-border-radius-sm);
+      border-radius: var(--rel-border-radius-xs);
       color: var(--rel-text-default);
       cursor: pointer;
-      padding: var(--rel-spacing-xs) var(--rel-spacing-sm);
-      text-align: center;
       flex-shrink: 0;
-      transition: all 0.15s ease;
-      font-family: var(--rel-body-sm-medium-font-family);
-      font-weight: var(--rel-body-sm-medium-font-weight);
-      font-size: var(--rel-body-sm-medium-font-size);
-      line-height: var(--rel-body-sm-medium-line-height);
-      letter-spacing: var(--rel-body-sm-medium-letter-spacing);
+      height: 36px;
+      padding: 0 var(--rel-spacing-xs);
+      text-align: center;
+      transition: background 0.15s ease;
+      font-family: var(--rel-body-md-regular-font-family);
+      font-weight: var(--rel-body-md-regular-font-weight);
+      font-size: var(--rel-body-md-regular-font-size);
+      line-height: var(--rel-body-md-regular-line-height);
+      letter-spacing: var(--rel-body-md-regular-letter-spacing);
     }
 
     .option-button:hover:not(:disabled):not(.selected) {
-      background: var(--rel-bg-surface-elevated);
+      background: var(--rel-bg-neutral-elevated-1);
     }
 
     .option-button:focus-visible {
@@ -338,9 +337,9 @@ export class RelTimePicker extends LitElement {
     }
 
     .option-button.selected {
-      background: var(--rel-action-brand-fill);
-      color: var(--rel-action-brand-label-icons-primary);
-      font-weight: var(--rel-body-md-semibold-font-weight);
+      background: var(--rel-bg-neutral-elevated-2);
+      color: var(--rel-text-default);
+      font-weight: var(--rel-body-md-medium-font-weight);
     }
 
     .option-button:disabled {
@@ -353,14 +352,15 @@ export class RelTimePicker extends LitElement {
       background: transparent;
     }
 
-    /* Footer (mirrors the range-picker calendar-footer) */
+    /* Footer (Figma "Footer"): 8px padding + 8px extra left so the "Now"
+       link aligns with the buttons' inner padding. Buttons are always S. */
     .time-footer {
       display: flex;
       align-items: center;
       justify-content: space-between;
-      gap: var(--rel-spacing-sm);
-      padding-top: var(--rel-spacing-sm);
-      margin-top: var(--rel-spacing-sm);
+      gap: var(--rel-spacing-xs);
+      padding: var(--rel-spacing-xs);
+      padding-left: calc(var(--rel-spacing-xs) * 2);
       border-top: 1px solid var(--rel-border-subtle);
     }
 
@@ -370,6 +370,56 @@ export class RelTimePicker extends LitElement {
       gap: var(--rel-spacing-xs);
     }
 
+    /* The design narrows OK below the DS small min-width (60 vs 80) so the
+       compact footer fits the 220px panel. */
+    .footer-right rel-button[variant="primary"] {
+      --rel-button-min-width: 60px;
+    }
+
+    /* Panel size variants (Figma S/M/L): width 220/250/280, option height
+       32/36/40, body-sm/md/lg type. Medium is the base above. */
+    .time-picker-wrapper.small .popover {
+      width: 220px;
+    }
+
+    .time-picker-wrapper.small .columns {
+      height: 232px;
+    }
+
+    .time-picker-wrapper.small .option-button {
+      height: 32px;
+      font-family: var(--rel-body-sm-regular-font-family);
+      font-weight: var(--rel-body-sm-regular-font-weight);
+      font-size: var(--rel-body-sm-regular-font-size);
+      line-height: var(--rel-body-sm-regular-line-height);
+      letter-spacing: var(--rel-body-sm-regular-letter-spacing);
+    }
+
+    .time-picker-wrapper.small .option-button.selected {
+      font-weight: var(--rel-body-sm-medium-font-weight);
+    }
+
+    .time-picker-wrapper.large .popover {
+      width: 280px;
+    }
+
+    .time-picker-wrapper.large .columns {
+      height: 288px;
+    }
+
+    .time-picker-wrapper.large .option-button {
+      height: 40px;
+      font-family: var(--rel-body-lg-regular-font-family);
+      font-weight: var(--rel-body-lg-regular-font-weight);
+      font-size: var(--rel-body-lg-regular-font-size);
+      line-height: var(--rel-body-lg-regular-line-height);
+      letter-spacing: var(--rel-body-lg-regular-letter-spacing);
+    }
+
+    .time-picker-wrapper.large .option-button.selected {
+      font-weight: var(--rel-body-lg-medium-font-weight);
+    }
+
     @media (prefers-reduced-motion: reduce) {
       .trigger-button,
       .icon-button,
@@ -406,11 +456,17 @@ export class RelTimePicker extends LitElement {
   };
 
   updated(changedProperties: Map<string, any>) {
-    if (changedProperties.has("open") && this.open) {
+    if (changedProperties.has("open")) {
+      if (!this.open) {
+        this.openUp = false;
+        return;
+      }
       this.resetDraftFromValue();
-      // Focus the selected (or first enabled) hour and center each column's
-      // selection once the popover has rendered.
+      // Once the popover has rendered: flip it above the field if the
+      // viewport lacks room below, center each column's selection, and focus
+      // the selected (or first enabled) hour without scrolling the page.
       setTimeout(() => {
+        this.updatePanelPlacement();
         this.scrollColumnsToSelection();
         const target =
           this.columnsElement?.querySelector<HTMLButtonElement>(
@@ -419,35 +475,51 @@ export class RelTimePicker extends LitElement {
           this.columnsElement?.querySelector<HTMLButtonElement>(
             ".option-button:not(:disabled)"
           );
-        target?.focus();
+        target?.focus({ preventScroll: true });
       }, 0);
     }
   }
 
+  /** Open upward when the panel doesn't fit below but does fit above. */
+  private updatePanelPlacement() {
+    const panel = this.renderRoot.querySelector<HTMLElement>(".popover");
+    if (!panel) return;
+    const rect = this.getBoundingClientRect();
+    const panelHeight = panel.offsetHeight;
+    const spaceBelow = window.innerHeight - rect.bottom;
+    this.openUp = spaceBelow < panelHeight + 8 && rect.top > panelHeight + 8;
+  }
+
   // ── Parsing / formatting ──
 
-  private parseTime(time: string | null): { hour: number; minute: number } | null {
+  private parseTime(
+    time: string | null
+  ): { hour: number; minute: number; second: number } | null {
     if (!time) return null;
-    const match = time.match(/^(\d{1,2}):(\d{2})$/);
+    const match = time.match(/^(\d{1,2}):(\d{2})(?::(\d{2}))?$/);
     if (!match) return null;
     const hour = parseInt(match[1], 10);
     const minute = parseInt(match[2], 10);
-    if (hour > 23 || minute > 59) return null;
-    return { hour, minute };
+    const second = match[3] ? parseInt(match[3], 10) : 0;
+    if (hour > 23 || minute > 59 || second > 59) return null;
+    return { hour, minute, second };
   }
 
-  private formatValue(hour: number, minute: number): string {
-    return `${String(hour).padStart(2, "0")}:${String(minute).padStart(2, "0")}`;
+  private formatValue(hour: number, minute: number, second = 0): string {
+    const hh = String(hour).padStart(2, "0");
+    const mm = String(minute).padStart(2, "0");
+    return this.seconds ? `${hh}:${mm}:${String(second).padStart(2, "0")}` : `${hh}:${mm}`;
   }
 
-  private formatDisplay(hour: number, minute: number): string {
+  private formatDisplay(hour: number, minute: number, second = 0): string {
     const mm = String(minute).padStart(2, "0");
+    const ss = this.seconds ? `:${String(second).padStart(2, "0")}` : "";
     if (this.format === "24h") {
-      return `${String(hour).padStart(2, "0")}:${mm}`;
+      return `${String(hour).padStart(2, "0")}:${mm}${ss}`;
     }
     const period = hour < 12 ? "AM" : "PM";
     const hour12 = hour % 12 === 0 ? 12 : hour % 12;
-    return `${hour12}:${mm} ${period}`;
+    return `${hour12}:${mm}${ss} ${period}`;
   }
 
   private toMinutes(hour: number, minute: number): number {
@@ -504,13 +576,22 @@ export class RelTimePicker extends LitElement {
         hour24: h,
       }));
     }
-    // 12-hour clock, chronological within the current period: 12, 01 … 11
+    // 12-hour clock, 01 … 12 as in the Figma "Hour 12" column ("12" maps to
+    // 00:xx AM / 12:xx PM).
     const period = this.draftPeriod ?? "AM";
     const base = period === "AM" ? 0 : 12;
-    return Array.from({ length: 12 }, (_, i) => ({
-      label: i === 0 ? "12" : String(i).padStart(2, "0"),
-      hour24: base + i,
-    }));
+    return Array.from({ length: 12 }, (_, i) => {
+      const display = i + 1;
+      return {
+        label: String(display).padStart(2, "0"),
+        hour24: base + (display % 12),
+      };
+    });
+  }
+
+  /** Seconds shown in the seconds column (always step 1). */
+  private getSecondOptions(): number[] {
+    return Array.from({ length: 60 }, (_, s) => s);
   }
 
   private get draftPeriod(): "AM" | "PM" | null {
@@ -522,6 +603,7 @@ export class RelTimePicker extends LitElement {
     const parsed = this.parseTime(this.value);
     this.draftHour = parsed ? parsed.hour : null;
     this.draftMinute = parsed ? parsed.minute : null;
+    this.draftSecond = parsed ? parsed.second : null;
   }
 
   /** Snap the draft minute to the nearest valid step minute for the hour. */
@@ -569,7 +651,11 @@ export class RelTimePicker extends LitElement {
 
   private applySelection() {
     if (this.draftHour === null) return;
-    const newValue = this.formatValue(this.draftHour, this.draftMinute ?? 0);
+    const newValue = this.formatValue(
+      this.draftHour,
+      this.draftMinute ?? 0,
+      this.draftSecond ?? 0
+    );
     this.value = newValue;
     this.dispatchEvent(
       new CustomEvent("rel-change", {
@@ -586,6 +672,7 @@ export class RelTimePicker extends LitElement {
     const now = new Date();
     const step = this.minuteStepSafe;
     this.draftHour = now.getHours();
+    this.draftSecond = this.seconds ? now.getSeconds() : null;
     this.draftMinute = Math.round(now.getMinutes() / step) * step;
     if (this.draftMinute >= 60) {
       this.draftMinute = 0;
@@ -610,6 +697,7 @@ export class RelTimePicker extends LitElement {
     this.value = null;
     this.draftHour = null;
     this.draftMinute = null;
+    this.draftSecond = null;
     this.dispatchEvent(
       new CustomEvent("rel-change", {
         detail: { value: null },
@@ -643,6 +731,22 @@ export class RelTimePicker extends LitElement {
     this.draftMinute = minute;
   }
 
+  private selectSecond(second: number) {
+    if (this.draftHour === null) {
+      // Second picked first — default the hour to the first enabled one.
+      for (let h = 0; h < 24; h++) {
+        if (this.isHourEnabled(h)) {
+          this.draftHour = h;
+          break;
+        }
+      }
+      if (this.draftHour === null) return;
+    }
+    if (this.draftMinute === null) this.draftMinute = 0;
+    this.draftSecond = second;
+    this.clampDraftToRange();
+  }
+
   private selectPeriod(period: "AM" | "PM") {
     if (!this.isPeriodEnabled(period)) return;
     const base = period === "AM" ? 0 : 12;
@@ -663,11 +767,30 @@ export class RelTimePicker extends LitElement {
     this.scrollColumnsToSelection();
   }
 
+  /**
+   * Scrolls the column's own scroll container only. scrollIntoView is off
+   * limits here: it walks ALL scrollable ancestors, so it yanked the page
+   * up/down whenever a column recentred (user-reported jump bug).
+   */
+  private scrollOptionInColumn(btn: HTMLElement, block: "center" | "nearest") {
+    const list = btn.parentElement;
+    if (!list) return;
+    const top = btn.offsetTop;
+    const height = btn.offsetHeight;
+    if (block === "center") {
+      list.scrollTop = top - (list.clientHeight - height) / 2;
+    } else if (top < list.scrollTop) {
+      list.scrollTop = top;
+    } else if (top + height > list.scrollTop + list.clientHeight) {
+      list.scrollTop = top + height - list.clientHeight;
+    }
+  }
+
   private scrollColumnsToSelection() {
     this.updateComplete.then(() => {
       this.columnsElement
         ?.querySelectorAll<HTMLButtonElement>(".option-button.selected")
-        .forEach((btn) => btn.scrollIntoView({ block: "center" }));
+        .forEach((btn) => this.scrollOptionInColumn(btn, "center"));
     });
   }
 
@@ -729,14 +852,15 @@ export class RelTimePicker extends LitElement {
 
     if (target && target !== buttons[index]) {
       target.click();
-      target.focus();
-      target.scrollIntoView({ block: "nearest" });
+      target.focus({ preventScroll: true });
+      this.scrollOptionInColumn(target, "nearest");
     }
   }
 
   private focusAdjacentColumn(from: TimeColumn, direction: 1 | -1) {
-    const order: TimeColumn[] =
-      this.format === "12h" ? ["hour", "minute", "period"] : ["hour", "minute"];
+    const order: TimeColumn[] = ["hour", "minute"];
+    if (this.seconds) order.push("second");
+    if (this.format === "12h") order.push("period");
     const nextIndex = order.indexOf(from) + direction;
     if (nextIndex < 0 || nextIndex >= order.length) return;
     const lists = this.columnsElement?.querySelectorAll(".column-list");
@@ -744,8 +868,10 @@ export class RelTimePicker extends LitElement {
     const target =
       list?.querySelector<HTMLButtonElement>(".option-button.selected:not(:disabled)") ??
       list?.querySelector<HTMLButtonElement>(".option-button:not(:disabled)");
-    target?.focus();
-    target?.scrollIntoView({ block: "nearest" });
+    if (target) {
+      target.focus({ preventScroll: true });
+      this.scrollOptionInColumn(target, "nearest");
+    }
   }
 
   // ── Render ──
@@ -756,14 +882,11 @@ export class RelTimePicker extends LitElement {
     const describedById = belowText ? "time-picker-desc" : undefined;
     const parsedValue = this.parseTime(this.value);
     const displayText = parsedValue
-      ? this.formatDisplay(parsedValue.hour, parsedValue.minute)
+      ? this.formatDisplay(parsedValue.hour, parsedValue.minute, parsedValue.second)
       : "";
-    const draftDisplay =
-      this.draftHour !== null
-        ? this.formatDisplay(this.draftHour, this.draftMinute ?? 0)
-        : "";
     const hourOptions = this.getHourOptions();
     const minuteOptions = this.getMinuteOptions();
+    const secondOptions = this.seconds ? this.getSecondOptions() : [];
     const draftPeriod = this.draftPeriod;
     const wrapperClasses = [
       "time-picker-wrapper",
@@ -841,120 +964,130 @@ export class RelTimePicker extends LitElement {
 
         <div
           part="panel"
-          class="popover ${this.open ? "open" : ""}"
+          class="popover ${this.open ? "open" : ""} ${this.openUp ? "open-up" : ""}"
           role="dialog"
           aria-label="Choose time"
         >
-          <div class="time-readout">
-            <span class="time-readout-label">Time</span>
-            <span class="time-readout-value ${draftDisplay ? "" : "empty"}">
-              ${draftDisplay || (this.format === "24h" ? "--:--" : "--:-- --")}
-            </span>
-          </div>
-
           <div class="columns">
-            <div class="column">
-              <div class="column-header" aria-hidden="true">Hour</div>
-              <div class="column-list" role="listbox" aria-label="Hours">
-                ${hourOptions.map(
-                  (opt, i) => html`
-                    <button
-                      part="option"
-                      class="option-button ${this.draftHour === opt.hour24
-                        ? "selected"
-                        : ""}"
-                      type="button"
-                      role="option"
-                      aria-selected=${this.draftHour === opt.hour24}
-                      ?disabled=${!this.isHourEnabled(opt.hour24)}
-                      @click=${() => this.selectHour(opt.hour24)}
-                      @keydown=${(e: KeyboardEvent) => this.handleOptionKeydown(e, "hour")}
-                      tabindex=${this.draftHour === opt.hour24 ||
-                      (this.draftHour === null && i === 0)
-                        ? 0
-                        : -1}
-                    >
-                      ${opt.label}
-                    </button>
-                  `
-                )}
-              </div>
+            <div class="column-list" role="listbox" aria-label="Hours">
+              ${hourOptions.map(
+                (opt, i) => html`
+                  <button
+                    part="option"
+                    class="option-button ${this.draftHour === opt.hour24
+                      ? "selected"
+                      : ""}"
+                    type="button"
+                    role="option"
+                    aria-selected=${this.draftHour === opt.hour24}
+                    ?disabled=${!this.isHourEnabled(opt.hour24)}
+                    @click=${() => this.selectHour(opt.hour24)}
+                    @keydown=${(e: KeyboardEvent) => this.handleOptionKeydown(e, "hour")}
+                    tabindex=${this.draftHour === opt.hour24 ||
+                    (this.draftHour === null && i === 0)
+                      ? 0
+                      : -1}
+                  >
+                    ${opt.label}
+                  </button>
+                `
+              )}
             </div>
 
-            <div class="column">
-              <div class="column-header" aria-hidden="true">Min</div>
-              <div class="column-list" role="listbox" aria-label="Minutes">
-                ${minuteOptions.map(
-                  (m, i) => html`
-                    <button
-                      part="option"
-                      class="option-button ${this.draftMinute === m ? "selected" : ""}"
-                      type="button"
-                      role="option"
-                      aria-selected=${this.draftMinute === m}
-                      ?disabled=${this.draftHour !== null &&
-                      !this.isTimeInRange(this.draftHour, m)}
-                      @click=${() => this.selectMinute(m)}
-                      @keydown=${(e: KeyboardEvent) =>
-                        this.handleOptionKeydown(e, "minute")}
-                      tabindex=${this.draftMinute === m ||
-                      (this.draftMinute === null && i === 0)
-                        ? 0
-                        : -1}
-                    >
-                      ${String(m).padStart(2, "0")}
-                    </button>
-                  `
-                )}
-              </div>
+            <div class="column-divider" aria-hidden="true"></div>
+
+            <div class="column-list" role="listbox" aria-label="Minutes">
+              ${minuteOptions.map(
+                (m, i) => html`
+                  <button
+                    part="option"
+                    class="option-button ${this.draftMinute === m ? "selected" : ""}"
+                    type="button"
+                    role="option"
+                    aria-selected=${this.draftMinute === m}
+                    ?disabled=${this.draftHour !== null &&
+                    !this.isTimeInRange(this.draftHour, m)}
+                    @click=${() => this.selectMinute(m)}
+                    @keydown=${(e: KeyboardEvent) =>
+                      this.handleOptionKeydown(e, "minute")}
+                    tabindex=${this.draftMinute === m ||
+                    (this.draftMinute === null && i === 0)
+                      ? 0
+                      : -1}
+                  >
+                    ${String(m).padStart(2, "0")}
+                  </button>
+                `
+              )}
             </div>
 
+            ${this.seconds
+              ? html`
+                  <div class="column-divider" aria-hidden="true"></div>
+                  <div class="column-list" role="listbox" aria-label="Seconds">
+                    ${secondOptions.map(
+                      (s, i) => html`
+                        <button
+                          part="option"
+                          class="option-button ${this.draftSecond === s
+                            ? "selected"
+                            : ""}"
+                          type="button"
+                          role="option"
+                          aria-selected=${this.draftSecond === s}
+                          @click=${() => this.selectSecond(s)}
+                          @keydown=${(e: KeyboardEvent) =>
+                            this.handleOptionKeydown(e, "second")}
+                          tabindex=${this.draftSecond === s ||
+                          (this.draftSecond === null && i === 0)
+                            ? 0
+                            : -1}
+                        >
+                          ${String(s).padStart(2, "0")}
+                        </button>
+                      `
+                    )}
+                  </div>
+                `
+              : nothing}
             ${this.format === "12h"
               ? html`
-                  <div class="column">
-                    <div class="column-header" aria-hidden="true">AM/PM</div>
-                    <div class="column-list" role="listbox" aria-label="AM or PM">
-                      ${(["AM", "PM"] as const).map(
-                        (p) => html`
-                          <button
-                            part="option"
-                            class="option-button ${draftPeriod === p ? "selected" : ""}"
-                            type="button"
-                            role="option"
-                            aria-selected=${draftPeriod === p}
-                            ?disabled=${!this.isPeriodEnabled(p)}
-                            @click=${() => this.selectPeriod(p)}
-                            @keydown=${(e: KeyboardEvent) =>
-                              this.handleOptionKeydown(e, "period")}
-                            tabindex=${draftPeriod === p ||
-                            (draftPeriod === null && p === "AM")
-                              ? 0
-                              : -1}
-                          >
-                            ${p}
-                          </button>
-                        `
-                      )}
-                    </div>
+                  <div class="column-divider" aria-hidden="true"></div>
+                  <div class="column-list" role="listbox" aria-label="AM or PM">
+                    ${(["AM", "PM"] as const).map(
+                      (p) => html`
+                        <button
+                          part="option"
+                          class="option-button ${draftPeriod === p ? "selected" : ""}"
+                          type="button"
+                          role="option"
+                          aria-selected=${draftPeriod === p}
+                          ?disabled=${!this.isPeriodEnabled(p)}
+                          @click=${() => this.selectPeriod(p)}
+                          @keydown=${(e: KeyboardEvent) =>
+                            this.handleOptionKeydown(e, "period")}
+                          tabindex=${draftPeriod === p ||
+                          (draftPeriod === null && p === "AM")
+                            ? 0
+                            : -1}
+                        >
+                          ${p}
+                        </button>
+                      `
+                    )}
                   </div>
                 `
               : nothing}
           </div>
 
           <div part="footer" class="time-footer">
-            <rel-button
-              variant="secondary"
-              size="small"
-              border="corner-radius"
-              @click=${() => this.selectNow()}
-            >
+            <rel-button variant="link" size="small" @click=${() => this.selectNow()}>
               Now
             </rel-button>
             <div class="footer-right">
               <rel-button
-                variant="secondary"
+                variant="ghost"
                 size="small"
-                border="corner-radius"
                 @click=${() => this.cancelPopover()}
               >
                 Cancel
@@ -963,11 +1096,10 @@ export class RelTimePicker extends LitElement {
                 variant="primary"
                 tone="default"
                 size="small"
-                border="corner-radius"
                 ?disabled=${this.draftHour === null}
                 @click=${() => this.applySelection()}
               >
-                Apply
+                OK
               </rel-button>
             </div>
           </div>