@onereach/ui-components 3.0.4-beta.2486.0 → 3.0.4-beta.2497.0

package/dist/esm/v3/{OrDateTimePicker-3e2dc067.js → OrDateTimePicker-a8247a84.js}

@@ -1,7 +1,4 @@
-import { defineComponent, ref, computed, reactive } from 'vue-demi';
-import { openBlock, createElementBlock, normalizeClass, resolveComponent, createVNode, withCtx, createTextVNode, toDisplayString, createElementVNode, renderSlot, withModifiers, Fragment, renderList, createBlock, resolveDirective, createCommentVNode, withDirectives, mergeProps, pushScopeId, popScopeId } from 'vue';
-import { s as styleInject } from './style-inject.es-4c6f2515.js';
-import { s as script$f, I as InputBoxSize } from './OrInputBox-901887a1.js';
+import { defineComponent, ref, computed, reactive, watch } from 'vue-demi';
 import { D as DropdownClose, a as DropdownOpen } from './dropdown-open-e1f90e0a.js';
 import { a as useIdAttribute, u as useControlAttributes } from './useIdAttribute-859439f0.js';
 import '@vueuse/core';
@@ -9,21 +6,59 @@ import { u as useValidationAttributes } from './useValidationAttributes-d1abbe34
 import { s as script$d } from './OrError-c01d0c29.js';
 import { s as script$e } from './OrHint-06ab89d7.js';
 import { s as script$a } from './OrIconButton-e3f4d060.js';
-import { s as script$7 } from './OrLabel-4da56db0.js';
+import { s as script$f, I as InputBoxSize } from './OrInputBox-901887a1.js';
+import { s as script$8 } from './OrLabel-4da56db0.js';
 import { s as script$g } from './OrPopover-3ac8f589.js';
-import { s as script$8 } from './OrButton-5a850657.js';
+import { s as script$7 } from './OrButton-5a850657.js';
+import { resolveComponent, openBlock, createElementBlock, normalizeClass, createElementVNode, Fragment, renderList, createBlock, withModifiers, withCtx, createTextVNode, toDisplayString, createVNode, renderSlot, resolveDirective, createCommentVNode, withDirectives, mergeProps, pushScopeId, popScopeId } from 'vue';
 import { s as script$9 } from './OrIcon-62793572.js';
 import { s as script$c } from './OrMenuItem-dbee450f.js';
-import { s as script$b } from './OrMenu-053a9ab7.js';
+import { s as script$b } from './OrMenu-70cee836.js';
+import { s as styleInject } from './style-inject.es-4c6f2515.js';
 
-const DateTimePickerDateSelect = [
+function useDefaultDate() {
+  return new Date().getUTCDate();
+}
+
+function useDefaultHours() {
+  return 0;
+}
+
+function useDefaultMinutes() {
+  return 0;
+}
+
+function useDefaultMonth() {
+  return new Date().getUTCMonth();
+}
+
+function useDefaultYear() {
+  return new Date().getUTCFullYear();
+}
+
+const DateTimePickerDaySelect = [
 // Layout
 'layout-column',
 // Spacing
 'px-md', 'py-md', 'gap-sm'];
+const DateTimePickerDaySelectButtonGroup = [
+// Layout
+'grid', 'grid-cols-7',
+// Spacing
+'gap-xs'];
+const DateTimePickerDaySelectButtonGroupItem = [
+// Box
+'min-w-fit',
+// Spacing
+'!px-sm', '!py-sm',
+// Typography
+'typography-caption-regular'];
 
 var script$6 = defineComponent({
-  name: 'OrDateTimePickerDateSelect',
+  name: 'OrDateTimePickerDaySelect',
+  components: {
+    OrButton: script$7
+  },
   model: {
     prop: 'modelValue',
     event: 'update:modelValue'
@@ -40,31 +75,77 @@ var script$6 = defineComponent({
     // Refs
     const root = ref();
     // Styles
-    const rootStyles = computed(() => ['or-date-time-picker-date-select', ...DateTimePickerDateSelect]);
+    const rootStyles = computed(() => ['or-date-time-picker-day-select', ...DateTimePickerDaySelect]);
+    const buttonGroupStyles = computed(() => [...DateTimePickerDaySelectButtonGroup]);
+    const buttonGroupItemStyles = computed(() => [...DateTimePickerDaySelectButtonGroupItem]);
     // State
     const proxyModelValue = computed({
-      get: () => props.modelValue,
+      get: () => {
+        var _a;
+        return (_a = props.modelValue) !== null && _a !== void 0 ? _a : new Date(Date.UTC(useDefaultYear(), useDefaultMonth(), useDefaultDate(), useDefaultHours(), useDefaultMinutes()));
+      },
       set: value => {
         context.emit('update:modelValue', value);
       }
     });
+    const dayOptions = computed(() => {
+      const monthStartDate = new Date(Date.UTC(proxyModelValue.value.getUTCFullYear(), proxyModelValue.value.getUTCMonth(), 1, proxyModelValue.value.getUTCHours(), proxyModelValue.value.getUTCMinutes()));
+      const monthEndDate = new Date(Date.UTC(proxyModelValue.value.getUTCFullYear(), proxyModelValue.value.getUTCMonth() + 1, 0, proxyModelValue.value.getUTCHours(), proxyModelValue.value.getUTCMinutes()));
+      const calendarStartDate = new Date(Date.UTC(monthStartDate.getUTCFullYear(), monthStartDate.getUTCMonth(), 1 - (monthStartDate.getUTCDay() + 6) % 7, monthStartDate.getUTCHours(), monthStartDate.getUTCMinutes()));
+      const calendarEndDate = new Date(Date.UTC(monthEndDate.getUTCFullYear(), monthEndDate.getUTCMonth() + 1, (7 - monthEndDate.getUTCDay()) % 7, monthEndDate.getUTCHours(), monthEndDate.getUTCMinutes()));
+      return (() => {
+        let options = [],
+          value = calendarStartDate;
+        while (Number(value) !== Number(calendarEndDate)) {
+          options = [...options, value];
+          value = new Date(Date.UTC(value.getUTCFullYear(), value.getUTCMonth(), value.getUTCDate() + 1, value.getUTCHours(), value.getUTCMinutes()));
+        }
+        return options;
+      })();
+    });
+    // Methods
+    function formatDay(value) {
+      return value.toLocaleString('default', {
+        day: 'numeric',
+        timeZone: 'UTC'
+      });
+    }
     return {
       root,
       rootStyles,
-      proxyModelValue
+      buttonGroupStyles,
+      buttonGroupItemStyles,
+      proxyModelValue,
+      dayOptions,
+      formatDay
     };
   }
 });
 
 function render$6(_ctx, _cache, $props, $setup, $data, $options) {
+  const _component_OrButton = resolveComponent("OrButton");
   return openBlock(), createElementBlock("div", {
     ref: "root",
     class: normalizeClass(_ctx.rootStyles)
-  }, " Calendar ", 2 /* CLASS */);
+  }, [createElementVNode("div", {
+    class: normalizeClass(_ctx.buttonGroupStyles)
+  }, [(openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.dayOptions, value => {
+    return openBlock(), createBlock(_component_OrButton, {
+      key: Number(value),
+      class: normalizeClass(_ctx.buttonGroupItemStyles),
+      variant: Number(value) === Number(_ctx.proxyModelValue) ? 'contained' : 'text',
+      color: Number(value) === Number(_ctx.proxyModelValue) ? 'primary' : 'inherit',
+      onClick: withModifiers($event => _ctx.proxyModelValue = value, ["stop"])
+    }, {
+      default: withCtx(() => [createTextVNode(toDisplayString(_ctx.formatDay(value)), 1 /* TEXT */)]),
+
+      _: 2 /* DYNAMIC */
+    }, 1032 /* PROPS, DYNAMIC_SLOTS */, ["class", "variant", "color", "onClick"]);
+  }), 128 /* KEYED_FRAGMENT */))], 2 /* CLASS */)], 2 /* CLASS */);
 }
 
 script$6.render = render$6;
-script$6.__file = "src/components/or-date-time-picker-v3/partials/or-date-time-picker-date-select/OrDateTimePickerDateSelect.vue";
+script$6.__file = "src/components/or-date-time-picker-v3/partials/or-date-time-picker-day-select/OrDateTimePickerDaySelect.vue";
 
 const DateTimePickerMobileControl = [
 // Layout
@@ -80,7 +161,7 @@ const DateTimePickerMobileControlContent = [
 var script$5 = defineComponent({
   name: 'OrDateTimePickerMobileControl',
   components: {
-    OrLabel: script$7
+    OrLabel: script$8
   },
   props: {
     label: {
@@ -129,7 +210,7 @@ const DateTimePickerMonthSelect = [
 var script$4 = defineComponent({
   name: 'OrDateTimePickerMonthSelect',
   components: {
-    OrButton: script$8,
+    OrButton: script$7,
     OrIcon: script$9,
     OrIconButton: script$a,
     OrMenu: script$b,
@@ -150,107 +231,99 @@ var script$4 = defineComponent({
   setup(props, context) {
     // Refs
     const root = ref();
-    const monthButton = ref();
     const yearButton = ref();
+    const monthButton = ref();
+    const yearButtonRoot = computed(() => {
+      var _a;
+      return (_a = yearButton.value) === null || _a === void 0 ? void 0 : _a.root;
+    });
     const monthButtonRoot = computed(() => {
       var _a;
       return (_a = monthButton.value) === null || _a === void 0 ? void 0 : _a.root;
     });
-    const yearButtonRoot = computed(() => {
+    const yearMenu = ref();
+    const monthMenu = ref();
+    const yearMenuState = computed(() => {
       var _a;
-      return (_a = yearButton.value) === null || _a === void 0 ? void 0 : _a.root;
+      return (_a = yearMenu.value) === null || _a === void 0 ? void 0 : _a.state;
+    });
+    const monthMenuState = computed(() => {
+      var _a;
+      return (_a = monthMenu.value) === null || _a === void 0 ? void 0 : _a.state;
     });
-    const monthMenu = ref();
-    const yearMenu = ref();
-    // const monthMenuState = computed(() => monthMenu.value?.state);
-    // const yearMenuState = computed(() => yearMenu.value?.state);
     // Styles
     const rootStyles = computed(() => ['or-date-time-picker-month-select', ...DateTimePickerMonthSelect]);
     // State
     const proxyModelValue = computed({
-      get: () => props.modelValue,
-      set: value => {
-        context.emit('update:modelValue', value);
-      }
-    });
-    const yearValue = computed({
-      get: () => {
-        var _a, _b;
-        return (_b = (_a = proxyModelValue.value) === null || _a === void 0 ? void 0 : _a.getUTCFullYear()) !== null && _b !== void 0 ? _b : new Date().getUTCFullYear();
-      },
-      set: value => {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
-        proxyModelValue.value = new Date(Date.UTC(value, (_b = (_a = proxyModelValue.value) === null || _a === void 0 ? void 0 : _a.getUTCMonth()) !== null && _b !== void 0 ? _b : monthValue.value, (_d = (_c = proxyModelValue.value) === null || _c === void 0 ? void 0 : _c.getUTCDate()) !== null && _d !== void 0 ? _d : 1, (_f = (_e = proxyModelValue.value) === null || _e === void 0 ? void 0 : _e.getUTCHours()) !== null && _f !== void 0 ? _f : 0, (_h = (_g = proxyModelValue.value) === null || _g === void 0 ? void 0 : _g.getUTCMinutes()) !== null && _h !== void 0 ? _h : 0));
-      }
-    });
-    const monthValue = computed({
       get: () => {
-        var _a, _b;
-        return (_b = (_a = proxyModelValue.value) === null || _a === void 0 ? void 0 : _a.getUTCMonth()) !== null && _b !== void 0 ? _b : new Date().getUTCMonth();
+        var _a;
+        return (_a = props.modelValue) !== null && _a !== void 0 ? _a : new Date(Date.UTC(useDefaultYear(), useDefaultMonth(), useDefaultDate(), useDefaultHours(), useDefaultMinutes()));
       },
       set: value => {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
-        proxyModelValue.value = new Date(Date.UTC((_b = (_a = proxyModelValue.value) === null || _a === void 0 ? void 0 : _a.getUTCFullYear()) !== null && _b !== void 0 ? _b : yearValue.value, value, (_d = (_c = proxyModelValue.value) === null || _c === void 0 ? void 0 : _c.getUTCDate()) !== null && _d !== void 0 ? _d : 1, (_f = (_e = proxyModelValue.value) === null || _e === void 0 ? void 0 : _e.getUTCHours()) !== null && _f !== void 0 ? _f : 0, (_h = (_g = proxyModelValue.value) === null || _g === void 0 ? void 0 : _g.getUTCMinutes()) !== null && _h !== void 0 ? _h : 0));
+        context.emit('update:modelValue', value);
       }
     });
-    const yearLabel = computed(() => {
-      var _a;
-      return (_a = yearOptions.find(({
-        value
-      }) => value === yearValue.value)) === null || _a === void 0 ? void 0 : _a.label;
+    const yearOptions = computed(() => {
+      return Array.from({
+        length: 11
+      }).map((_value, index, {
+        length
+      }) => {
+        const value = proxyModelValue.value.getUTCFullYear() - Math.floor(length / 2) + index;
+        return new Date(Date.UTC(value, proxyModelValue.value.getUTCMonth(), proxyModelValue.value.getUTCDate(), proxyModelValue.value.getUTCHours(), proxyModelValue.value.getUTCMinutes()));
+      });
     });
-    const monthLabel = computed(() => {
-      var _a;
-      return (_a = monthOptions.find(({
-        value
-      }) => value === monthValue.value)) === null || _a === void 0 ? void 0 : _a.label;
-    });
-    const yearOptions = Array.from({
-      length: 100
-    }, (_value, index) => {
-      const year = new Date().getUTCFullYear() - index;
-      return {
-        value: year,
-        label: new Date(year, monthValue.value).toLocaleString([], {
-          year: 'numeric'
-        })
-      };
-    });
-    const monthOptions = Array.from({
-      length: 12
-    }, (_value, index) => {
-      const month = index;
-      return {
-        value: month,
-        label: new Date(yearValue.value, month).toLocaleString([], {
-          month: 'long'
-        })
-      };
+    const monthOptions = computed(() => {
+      return Array.from({
+        length: 12
+      }, (_value, index) => {
+        const value = index;
+        return new Date(Date.UTC(proxyModelValue.value.getUTCFullYear(), value, proxyModelValue.value.getUTCDate(), proxyModelValue.value.getUTCHours(), proxyModelValue.value.getUTCMinutes()));
+      });
     });
+    // Methods
+    function goToNextMonth() {
+      proxyModelValue.value = new Date(Date.UTC(proxyModelValue.value.getUTCFullYear(), proxyModelValue.value.getUTCMonth() + 1, proxyModelValue.value.getUTCDate(), proxyModelValue.value.getUTCHours(), proxyModelValue.value.getUTCMinutes()));
+    }
+    function goToPreviousMonth() {
+      proxyModelValue.value = new Date(Date.UTC(proxyModelValue.value.getUTCFullYear(), proxyModelValue.value.getUTCMonth() - 1, proxyModelValue.value.getUTCDate(), proxyModelValue.value.getUTCHours(), proxyModelValue.value.getUTCMinutes()));
+    }
+    function formatYear(value) {
+      return value.toLocaleString('default', {
+        year: 'numeric',
+        timeZone: 'UTC'
+      });
+    }
+    function formatMonth(value) {
+      return value.toLocaleString('default', {
+        month: 'long',
+        timeZone: 'UTC'
+      });
+    }
     return {
       root,
-      monthButton,
       yearButton,
-      monthButtonRoot,
+      monthButton,
       yearButtonRoot,
-      monthMenu,
+      monthButtonRoot,
       yearMenu,
-      // monthMenuState,
-      // yearMenuState,
+      monthMenu,
+      yearMenuState,
+      monthMenuState,
       rootStyles,
       proxyModelValue,
-      yearValue,
-      monthValue,
-      yearLabel,
-      monthLabel,
       yearOptions,
-      monthOptions
+      monthOptions,
+      goToNextMonth,
+      goToPreviousMonth,
+      formatYear,
+      formatMonth
     };
   }
 });
 
 const _hoisted_1$1 = {
-  class: /*#__PURE__*/normalizeClass(['layout-row', 'gap-md'])
+  class: /*#__PURE__*/normalizeClass(['layout-row-reverse', 'gap-md'])
 };
 function render$4(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_OrIconButton = resolveComponent("OrIconButton");
@@ -263,68 +336,70 @@ function render$4(_ctx, _cache, $props, $setup, $data, $options) {
     class: normalizeClass(_ctx.rootStyles)
   }, [createVNode(_component_OrIconButton, {
     icon: 'chevron_left',
-    onClick: _cache[0] || (_cache[0] = withModifiers($event => _ctx.monthValue = _ctx.monthValue - 1, ["stop"]))
+    onClick: _cache[0] || (_cache[0] = withModifiers($event => _ctx.goToPreviousMonth(), ["stop"]))
   }), createElementVNode("div", _hoisted_1$1, [createVNode(_component_OrButton, {
-    ref: "monthButton",
+    ref: "yearButton",
     variant: 'link',
     color: 'inherit',
-    onClick: _cache[1] || (_cache[1] = withModifiers($event => _ctx.monthMenu.open(), ["stop"]))
+    onClick: _cache[1] || (_cache[1] = withModifiers($event => _ctx.yearMenu.open(), ["stop"]))
   }, {
-    default: withCtx(() => [createTextVNode(toDisplayString(_ctx.monthLabel) + " ", 1 /* TEXT */), createVNode(_component_OrIcon, {
-      icon: 'arrow_drop_down'
-    })]),
+    default: withCtx(() => [createTextVNode(toDisplayString(_ctx.formatYear(_ctx.proxyModelValue)) + " ", 1 /* TEXT */), createVNode(_component_OrIcon, {
+      icon: _ctx.yearMenuState === 'open' ? 'arrow_drop_up' : 'arrow_drop_down'
+    }, null, 8 /* PROPS */, ["icon"])]),
     _: 1 /* STABLE */
   }, 512 /* NEED_PATCH */), createVNode(_component_OrButton, {
-    ref: "yearButton",
+    ref: "monthButton",
     variant: 'link',
     color: 'inherit',
-    onClick: _cache[2] || (_cache[2] = withModifiers($event => _ctx.yearMenu.open(), ["stop"]))
+    onClick: _cache[2] || (_cache[2] = withModifiers($event => _ctx.monthMenu.open(), ["stop"]))
   }, {
-    default: withCtx(() => [createTextVNode(toDisplayString(_ctx.yearLabel) + " ", 1 /* TEXT */), createVNode(_component_OrIcon, {
-      icon: 'arrow_drop_down'
-    })]),
+    default: withCtx(() => [createTextVNode(toDisplayString(_ctx.formatMonth(_ctx.proxyModelValue)) + " ", 1 /* TEXT */), createVNode(_component_OrIcon, {
+      icon: _ctx.monthMenuState === 'open' ? 'arrow_drop_up' : 'arrow_drop_down'
+    }, null, 8 /* PROPS */, ["icon"])]),
     _: 1 /* STABLE */
   }, 512 /* NEED_PATCH */), createVNode(_component_OrMenu, {
-    ref: "monthMenu",
-    trigger: _ctx.monthButtonRoot
+    ref: "yearMenu",
+    trigger: _ctx.yearButtonRoot
   }, {
-    default: withCtx(() => [(openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.monthOptions, option => {
+    default: withCtx(() => [(openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.yearOptions, value => {
       return openBlock(), createBlock(_component_OrMenuItem, {
-        key: option.value,
+        key: Number(value),
+        selected: Number(value) === Number(_ctx.proxyModelValue),
         onClick: withModifiers($event => {
-          _ctx.monthValue = option.value;
-          _ctx.monthMenu.close();
+          _ctx.proxyModelValue = value;
+          _ctx.yearMenu.close();
         }, ["stop"])
       }, {
-        default: withCtx(() => [createTextVNode(toDisplayString(option.label), 1 /* TEXT */)]),
+        default: withCtx(() => [createTextVNode(toDisplayString(_ctx.formatYear(value)), 1 /* TEXT */)]),
 
         _: 2 /* DYNAMIC */
-      }, 1032 /* PROPS, DYNAMIC_SLOTS */, ["onClick"]);
+      }, 1032 /* PROPS, DYNAMIC_SLOTS */, ["selected", "onClick"]);
     }), 128 /* KEYED_FRAGMENT */))]),
 
     _: 1 /* STABLE */
   }, 8 /* PROPS */, ["trigger"]), createVNode(_component_OrMenu, {
-    ref: "yearMenu",
-    trigger: _ctx.yearButtonRoot
+    ref: "monthMenu",
+    trigger: _ctx.monthButtonRoot
   }, {
-    default: withCtx(() => [(openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.yearOptions, option => {
+    default: withCtx(() => [(openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.monthOptions, value => {
       return openBlock(), createBlock(_component_OrMenuItem, {
-        key: option.value,
+        key: Number(value),
+        selected: Number(value) === Number(_ctx.proxyModelValue),
         onClick: withModifiers($event => {
-          _ctx.yearValue = option.value;
-          _ctx.yearMenu.close();
+          _ctx.proxyModelValue = value;
+          _ctx.monthMenu.close();
         }, ["stop"])
       }, {
-        default: withCtx(() => [createTextVNode(toDisplayString(option.label), 1 /* TEXT */)]),
+        default: withCtx(() => [createTextVNode(toDisplayString(_ctx.formatMonth(value)), 1 /* TEXT */)]),
 
         _: 2 /* DYNAMIC */
-      }, 1032 /* PROPS, DYNAMIC_SLOTS */, ["onClick"]);
+      }, 1032 /* PROPS, DYNAMIC_SLOTS */, ["selected", "onClick"]);
     }), 128 /* KEYED_FRAGMENT */))]),
 
     _: 1 /* STABLE */
   }, 8 /* PROPS */, ["trigger"])]), createVNode(_component_OrIconButton, {
     icon: 'chevron_right',
-    onClick: _cache[3] || (_cache[3] = withModifiers($event => _ctx.monthValue = _ctx.monthValue + 1, ["stop"]))
+    onClick: _cache[3] || (_cache[3] = withModifiers($event => _ctx.goToNextMonth(), ["stop"]))
   })], 2 /* CLASS */);
 }
 
@@ -342,7 +417,7 @@ const DateTimePickerPopoverFooter = [
 var script$3 = defineComponent({
   name: 'OrDateTimePickerPopoverFooter',
   components: {
-    OrButton: script$8
+    OrButton: script$7
   },
   emits: ['resolve', 'reject'],
   expose: ['root'],
@@ -435,7 +510,7 @@ const DateTimePickerTimeSelectButtonGroupItem = [
 var script$1 = defineComponent({
   name: 'OrDateTimePickerTimeSelect',
   components: {
-    OrButton: script$8
+    OrButton: script$7
   },
   model: {
     prop: 'modelValue',
@@ -458,53 +533,53 @@ var script$1 = defineComponent({
     const buttonGroupItemStyles = computed(() => [...DateTimePickerTimeSelectButtonGroupItem]);
     // State
     const proxyModelValue = computed({
-      get: () => props.modelValue,
-      set: value => {
-        context.emit('update:modelValue', value);
-      }
-    });
-    const hoursValue = computed({
       get: () => {
-        var _a, _b;
-        return (_b = (_a = proxyModelValue.value) === null || _a === void 0 ? void 0 : _a.getUTCHours()) !== null && _b !== void 0 ? _b : 0;
+        var _a;
+        return (_a = props.modelValue) !== null && _a !== void 0 ? _a : new Date(Date.UTC(useDefaultYear(), useDefaultMonth(), useDefaultDate(), useDefaultHours(), useDefaultMinutes()));
       },
       set: value => {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
-        proxyModelValue.value = new Date(Date.UTC((_b = (_a = proxyModelValue.value) === null || _a === void 0 ? void 0 : _a.getUTCFullYear()) !== null && _b !== void 0 ? _b : 1970, (_d = (_c = proxyModelValue.value) === null || _c === void 0 ? void 0 : _c.getUTCMonth()) !== null && _d !== void 0 ? _d : 0, (_f = (_e = proxyModelValue.value) === null || _e === void 0 ? void 0 : _e.getUTCDate()) !== null && _f !== void 0 ? _f : 1, value, (_h = (_g = proxyModelValue.value) === null || _g === void 0 ? void 0 : _g.getUTCMinutes()) !== null && _h !== void 0 ? _h : minutesValue.value));
+        context.emit('update:modelValue', value);
       }
     });
-    const minutesValue = computed({
-      get: () => {
-        var _a, _b;
-        return (_b = (_a = proxyModelValue.value) === null || _a === void 0 ? void 0 : _a.getUTCMinutes()) !== null && _b !== void 0 ? _b : 0;
-      },
-      set: value => {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
-        proxyModelValue.value = new Date(Date.UTC((_b = (_a = proxyModelValue.value) === null || _a === void 0 ? void 0 : _a.getUTCFullYear()) !== null && _b !== void 0 ? _b : 1970, (_d = (_c = proxyModelValue.value) === null || _c === void 0 ? void 0 : _c.getUTCMonth()) !== null && _d !== void 0 ? _d : 0, (_f = (_e = proxyModelValue.value) === null || _e === void 0 ? void 0 : _e.getUTCDate()) !== null && _f !== void 0 ? _f : 1, (_h = (_g = proxyModelValue.value) === null || _g === void 0 ? void 0 : _g.getUTCHours()) !== null && _h !== void 0 ? _h : hoursValue.value, value));
-      }
+    const hoursOptions = computed(() => {
+      return Array.from({
+        length: 24
+      }, (_value, index) => {
+        const value = index;
+        return new Date(Date.UTC(proxyModelValue.value.getUTCFullYear(), proxyModelValue.value.getUTCMonth(), proxyModelValue.value.getUTCDate(), value, proxyModelValue.value.getUTCMinutes()));
+      });
+    });
+    const minutesOptions = computed(() => {
+      return Array.from({
+        length: 60
+      }, (_value, index) => {
+        const value = index;
+        return new Date(Date.UTC(proxyModelValue.value.getUTCFullYear(), proxyModelValue.value.getUTCMonth(), proxyModelValue.value.getUTCDate(), proxyModelValue.value.getUTCHours(), value));
+      });
     });
-    const hoursOptions = Array.from({
-      length: 24
-    }, (_value, index) => ({
-      value: index,
-      label: String(index).padStart(2, '0')
-    }));
-    const minutesOptions = Array.from({
-      length: 60
-    }, (_value, index) => ({
-      value: index,
-      label: String(index).padStart(2, '0')
-    }));
+    // Methods
+    function formatHours(value) {
+      return value.toLocaleString('default', {
+        hour: '2-digit',
+        timeZone: 'UTC'
+      });
+    }
+    function formatMinutes(value) {
+      return value.toLocaleString('default', {
+        minute: '2-digit',
+        timeZone: 'UTC'
+      });
+    }
     return {
       root,
       rootStyles,
       buttonGroupStyles,
       buttonGroupItemStyles,
       proxyModelValue,
-      hoursValue,
-      minutesValue,
       hoursOptions,
-      minutesOptions
+      minutesOptions,
+      formatHours,
+      formatMinutes
     };
   }
 });
@@ -516,29 +591,29 @@ function render$1(_ctx, _cache, $props, $setup, $data, $options) {
     class: normalizeClass(_ctx.rootStyles)
   }, [createElementVNode("div", {
     class: normalizeClass(_ctx.buttonGroupStyles)
-  }, [(openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.hoursOptions, option => {
+  }, [(openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.hoursOptions, value => {
     return openBlock(), createBlock(_component_OrButton, {
-      key: option.value,
+      key: Number(value),
       class: normalizeClass(_ctx.buttonGroupItemStyles),
-      variant: _ctx.hoursValue === option.value ? 'contained' : 'text',
-      color: _ctx.hoursValue === option.value ? 'primary' : 'inherit',
-      onClick: withModifiers($event => _ctx.hoursValue = option.value, ["stop"])
+      variant: Number(value) === Number(_ctx.proxyModelValue) ? 'contained' : 'text',
+      color: Number(value) === Number(_ctx.proxyModelValue) ? 'primary' : 'inherit',
+      onClick: withModifiers($event => _ctx.proxyModelValue = value, ["stop"])
     }, {
-      default: withCtx(() => [createTextVNode(toDisplayString(option.label), 1 /* TEXT */)]),
+      default: withCtx(() => [createTextVNode(toDisplayString(_ctx.formatHours(value)), 1 /* TEXT */)]),
 
       _: 2 /* DYNAMIC */
     }, 1032 /* PROPS, DYNAMIC_SLOTS */, ["class", "variant", "color", "onClick"]);
   }), 128 /* KEYED_FRAGMENT */))], 2 /* CLASS */), createTextVNode(" : "), createElementVNode("div", {
     class: normalizeClass(_ctx.buttonGroupStyles)
-  }, [(openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.minutesOptions, option => {
+  }, [(openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.minutesOptions, value => {
     return openBlock(), createBlock(_component_OrButton, {
-      key: option.value,
+      key: Number(value),
       class: normalizeClass(_ctx.buttonGroupItemStyles),
-      variant: _ctx.minutesValue === option.value ? 'contained' : 'text',
-      color: _ctx.minutesValue === option.value ? 'primary' : 'inherit',
-      onClick: withModifiers($event => _ctx.minutesValue = option.value, ["stop"])
+      variant: Number(value) === Number(_ctx.proxyModelValue) ? 'contained' : 'text',
+      color: Number(value) === Number(_ctx.proxyModelValue) ? 'primary' : 'inherit',
+      onClick: withModifiers($event => _ctx.proxyModelValue = value, ["stop"])
     }, {
-      default: withCtx(() => [createTextVNode(toDisplayString(option.label), 1 /* TEXT */)]),
+      default: withCtx(() => [createTextVNode(toDisplayString(_ctx.formatMinutes(value)), 1 /* TEXT */)]),
 
       _: 2 /* DYNAMIC */
     }, 1032 /* PROPS, DYNAMIC_SLOTS */, ["class", "variant", "color", "onClick"]);
@@ -554,13 +629,15 @@ const DateTimePicker = [
 // Spacing
 'gap-xs'];
 const DateTimePickerControl = [
+// Layout
+'layout-inline-row justify-center',
 // Theme (focus)
-'focus:theme-border-1-current', 'dark:focus:theme-border-1-current-dark', 'focus:theme-border-underline', 'dark:focus:theme-border-underline'];
+'focus:theme-border-2-current', 'dark:focus:theme-border-2-current-dark', 'focus:theme-border-underline', 'dark:focus:theme-border-underline'];
 
 var script = defineComponent({
   name: 'OrDateTimePicker',
   components: {
-    OrDateTimePickerDateSelect: script$6,
+    OrDateTimePickerDaySelect: script$6,
     OrDateTimePickerMobileControl: script$5,
     OrDateTimePickerMonthSelect: script$4,
     OrDateTimePickerPopoverFooter: script$3,
@@ -570,7 +647,7 @@ var script = defineComponent({
     OrHint: script$e,
     OrIconButton: script$a,
     OrInputBox: script$f,
-    OrLabel: script$7,
+    OrLabel: script$8,
     OrPopover: script$g
   },
   directives: {
@@ -651,6 +728,12 @@ var script = defineComponent({
         context.emit('update:modelValue', value);
       }
     });
+    const draftModelValue = ref();
+    watch(proxyModelValue, value => {
+      draftModelValue.value = value;
+    }, {
+      immediate: true
+    });
     // Methods
     function toggleDatePopover() {
       if (!props.readonly && !props.disabled) {
@@ -688,6 +771,34 @@ var script = defineComponent({
         popoverInstance.close();
       }
     }
+    function formatDate(value) {
+      var _a;
+      return (_a = value === null || value === void 0 ? void 0 : value.toLocaleString('default', {
+        dateStyle: 'short',
+        timeZone: 'UTC'
+      })) !== null && _a !== void 0 ? _a : '--';
+    }
+    function formatTime(value) {
+      var _a;
+      return (_a = value === null || value === void 0 ? void 0 : value.toLocaleString('default', {
+        timeStyle: 'short',
+        timeZone: 'UTC'
+      })) !== null && _a !== void 0 ? _a : '--';
+    }
+    function formatDateAlt(value) {
+      var _a;
+      return (_a = value === null || value === void 0 ? void 0 : value.toLocaleString('default', {
+        dateStyle: 'medium',
+        timeZone: 'UTC'
+      })) !== null && _a !== void 0 ? _a : '--';
+    }
+    function formatTimeAlt(value) {
+      var _a;
+      return (_a = value === null || value === void 0 ? void 0 : value.toLocaleString('default', {
+        timeStyle: 'short',
+        timeZone: 'UTC'
+      })) !== null && _a !== void 0 ? _a : '--';
+    }
     return {
       root,
       dateControl,
@@ -700,10 +811,15 @@ var script = defineComponent({
       controlStyles,
       controlAttributes,
       proxyModelValue,
+      draftModelValue,
       toggleDatePopover,
       toggleTimePopover,
       closeDatePopover,
-      closeTimePopover
+      closeTimePopover,
+      formatDate,
+      formatTime,
+      formatDateAlt,
+      formatTimeAlt
     };
   }
 });
@@ -722,7 +838,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_OrDateTimePickerMobileControl = resolveComponent("OrDateTimePickerMobileControl");
   const _component_OrDateTimePickerPopoverHeader = resolveComponent("OrDateTimePickerPopoverHeader");
   const _component_OrDateTimePickerMonthSelect = resolveComponent("OrDateTimePickerMonthSelect");
-  const _component_OrDateTimePickerDateSelect = resolveComponent("OrDateTimePickerDateSelect");
+  const _component_OrDateTimePickerDaySelect = resolveComponent("OrDateTimePickerDaySelect");
   const _component_OrDateTimePickerPopoverFooter = resolveComponent("OrDateTimePickerPopoverFooter");
   const _component_OrPopover = resolveComponent("OrPopover");
   const _component_OrDateTimePickerTimeSelect = resolveComponent("OrDateTimePickerTimeSelect");
@@ -753,23 +869,23 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
     readonly: _ctx.readonly,
     disabled: _ctx.disabled
   }, {
-    default: withCtx(() => [withDirectives(createElementVNode("input", mergeProps({
+    default: withCtx(() => [createCommentVNode(" <input\n        ref=\"dateControl\"\n        v-dropdown-open=\"toggleDatePopover\"\n        v-dropdown-close=\"closeDatePopover\"\n        v-bind=\"controlAttributes\"\n        :class=\"controlStyles\"\n        :type=\"'text'\"\n        :value=\"formatDate(proxyModelValue)\"\n        :required=\"required\"\n        :readonly=\"readonly\"\n        :disabled=\"disabled\"\n      > "), createCommentVNode(" <input\n        ref=\"timeControl\"\n        v-dropdown-open=\"toggleTimePopover\"\n        v-dropdown-close=\"closeTimePopover\"\n        v-bind=\"controlAttributes\"\n        :class=\"controlStyles\"\n        :type=\"'text'\"\n        :value=\"formatTime(proxyModelValue)\"\n        :required=\"required\"\n        :readonly=\"readonly\"\n        :disabled=\"disabled\"\n      > "), withDirectives((openBlock(), createElementBlock("div", mergeProps({
       ref: "dateControl"
     }, _ctx.controlAttributes, {
       class: _ctx.controlStyles,
-      type: 'date',
+      contenteditable: true,
       required: _ctx.required,
       readonly: _ctx.readonly,
       disabled: _ctx.disabled
-    }), null, 16 /* FULL_PROPS */, _hoisted_1), [[_directive_dropdown_open, _ctx.toggleDatePopover], [_directive_dropdown_close, _ctx.closeDatePopover]]), withDirectives(createElementVNode("input", mergeProps({
+    }), [createTextVNode(toDisplayString(_ctx.formatDate(_ctx.proxyModelValue)), 1 /* TEXT */)], 16 /* FULL_PROPS */, _hoisted_1)), [[_directive_dropdown_open, _ctx.toggleDatePopover], [_directive_dropdown_close, _ctx.closeDatePopover]]), withDirectives((openBlock(), createElementBlock("div", mergeProps({
       ref: "timeControl"
     }, _ctx.controlAttributes, {
       class: _ctx.controlStyles,
-      type: 'time',
+      contenteditable: true,
       required: _ctx.required,
       readonly: _ctx.readonly,
       disabled: _ctx.disabled
-    }), null, 16 /* FULL_PROPS */, _hoisted_2), [[_directive_dropdown_open, _ctx.toggleTimePopover], [_directive_dropdown_close, _ctx.closeTimePopover]]), createVNode(_component_OrPopover, {
+    }), [createTextVNode(toDisplayString(_ctx.formatTime(_ctx.proxyModelValue)), 1 /* TEXT */)], 16 /* FULL_PROPS */, _hoisted_2)), [[_directive_dropdown_open, _ctx.toggleTimePopover], [_directive_dropdown_close, _ctx.closeTimePopover]]), createVNode(_component_OrPopover, {
       ref: "datePopover",
       variant: 'auto',
       trigger: _ctx.dateControl,
@@ -779,24 +895,33 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
         default: withCtx(() => [createVNode(_component_OrDateTimePickerMobileControl, {
           label: "Date"
         }, {
-          default: withCtx(() => [createTextVNode(" Sep 12 ")]),
+          default: withCtx(() => [createTextVNode(toDisplayString(_ctx.formatDateAlt(_ctx.draftModelValue)), 1 /* TEXT */)]),
+
           _: 1 /* STABLE */
         }), createVNode(_component_OrDateTimePickerMobileControl, {
           label: "Time"
         }, {
-          default: withCtx(() => [createTextVNode(" 9:07 ")]),
+          default: withCtx(() => [createTextVNode(toDisplayString(_ctx.formatTimeAlt(_ctx.draftModelValue)), 1 /* TEXT */)]),
+
           _: 1 /* STABLE */
         })]),
 
         _: 1 /* STABLE */
       }), createVNode(_component_OrDateTimePickerMonthSelect, {
-        modelValue: _ctx.proxyModelValue,
-        "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => _ctx.proxyModelValue = $event)
-      }, null, 8 /* PROPS */, ["modelValue"]), createVNode(_component_OrDateTimePickerDateSelect, {
-        modelValue: _ctx.proxyModelValue,
-        "onUpdate:modelValue": _cache[1] || (_cache[1] = $event => _ctx.proxyModelValue = $event)
+        modelValue: _ctx.draftModelValue,
+        "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => _ctx.draftModelValue = $event)
+      }, null, 8 /* PROPS */, ["modelValue"]), createVNode(_component_OrDateTimePickerDaySelect, {
+        modelValue: _ctx.draftModelValue,
+        "onUpdate:modelValue": _cache[1] || (_cache[1] = $event => _ctx.draftModelValue = $event)
       }, null, 8 /* PROPS */, ["modelValue"]), createVNode(_component_OrDateTimePickerPopoverFooter, {
-        onReject: _cache[2] || (_cache[2] = $event => _ctx.closeDatePopover())
+        onResolve: _cache[2] || (_cache[2] = $event => {
+          _ctx.proxyModelValue = _ctx.draftModelValue;
+          _ctx.datePopover.close();
+        }),
+        onReject: _cache[3] || (_cache[3] = $event => {
+          _ctx.draftModelValue = _ctx.proxyModelValue;
+          _ctx.datePopover.close();
+        })
       })]),
       _: 1 /* STABLE */
     }, 8 /* PROPS */, ["trigger"]), createVNode(_component_OrPopover, {
@@ -809,21 +934,30 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
         default: withCtx(() => [createVNode(_component_OrDateTimePickerMobileControl, {
           label: "Date"
         }, {
-          default: withCtx(() => [createTextVNode(" Sep 12 ")]),
+          default: withCtx(() => [createTextVNode(toDisplayString(_ctx.formatDateAlt(_ctx.draftModelValue)), 1 /* TEXT */)]),
+
           _: 1 /* STABLE */
         }), createVNode(_component_OrDateTimePickerMobileControl, {
           label: "Time"
         }, {
-          default: withCtx(() => [createTextVNode(" 9:07 ")]),
+          default: withCtx(() => [createTextVNode(toDisplayString(_ctx.formatTimeAlt(_ctx.draftModelValue)), 1 /* TEXT */)]),
+
           _: 1 /* STABLE */
         })]),
 
         _: 1 /* STABLE */
       }), createVNode(_component_OrDateTimePickerTimeSelect, {
-        modelValue: _ctx.proxyModelValue,
-        "onUpdate:modelValue": _cache[3] || (_cache[3] = $event => _ctx.proxyModelValue = $event)
+        modelValue: _ctx.draftModelValue,
+        "onUpdate:modelValue": _cache[4] || (_cache[4] = $event => _ctx.draftModelValue = $event)
       }, null, 8 /* PROPS */, ["modelValue"]), createVNode(_component_OrDateTimePickerPopoverFooter, {
-        onReject: _cache[4] || (_cache[4] = $event => _ctx.closeTimePopover())
+        onResolve: _cache[5] || (_cache[5] = $event => {
+          _ctx.proxyModelValue = _ctx.draftModelValue;
+          _ctx.timePopover.close();
+        }),
+        onReject: _cache[6] || (_cache[6] = $event => {
+          _ctx.draftModelValue = _ctx.proxyModelValue;
+          _ctx.timePopover.close();
+        })
       })]),
       _: 1 /* STABLE */
     }, 8 /* PROPS */, ["trigger"]), _hoisted_3, createElementVNode("div", _hoisted_4, [_ctx.modelValue ? (openBlock(), createBlock(_component_OrIconButton, {
@@ -831,7 +965,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
       icon: 'close',
       color: 'inherit',
       disabled: _ctx.readonly || _ctx.disabled,
-      onClick: _cache[5] || (_cache[5] = withModifiers($event => _ctx.$emit('update:modelValue', undefined), ["stop"]))
+      onClick: _cache[7] || (_cache[7] = withModifiers($event => _ctx.$emit('update:modelValue', undefined), ["stop"]))
     }, null, 8 /* PROPS */, ["disabled"])) : createCommentVNode("v-if", true)])]),
     _: 1 /* STABLE */
   }, 8 /* PROPS */, ["variant", "size", "invalid", "readonly", "disabled"])), [[_directive_dropdown_open, _ctx.toggleDatePopover], [_directive_dropdown_close, _ctx.closeDatePopover]]), !_ctx.error ? (openBlock(), createElementBlock(Fragment, {
@@ -853,7 +987,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
   }, 8 /* PROPS */, ["disabled"])) : createCommentVNode("v-if", true)], 2 /* CLASS */);
 }
 
-var css_248z = "\ninput[data-v-4ab76bac] {\n  min-width: 0;\n  background: none;\n  outline: none;\n}\ninput[type=\"date\"][data-v-4ab76bac]::-webkit-datetime-edit-day-field,\ninput[type=\"date\"][data-v-4ab76bac]::-webkit-datetime-edit-month-field,\ninput[type=\"date\"][data-v-4ab76bac]::-webkit-datetime-edit-year-field {\n  display: none;\n}\ninput[type=\"time\"][data-v-4ab76bac]::-webkit-datetime-edit-hour-field,\ninput[type=\"time\"][data-v-4ab76bac]::-webkit-datetime-edit-minute-field,\ninput[type=\"time\"][data-v-4ab76bac]::-webkit-datetime-edit-ampm-field {\n  display: none;\n}\ninput[type=\"date\"][data-v-4ab76bac]::-webkit-datetime-edit-text,\ninput[type=\"time\"][data-v-4ab76bac]::-webkit-datetime-edit-text {\n  display: none;\n}\ninput[type=\"date\"][data-v-4ab76bac]::-webkit-calendar-picker-indicator,\ninput[type=\"time\"][data-v-4ab76bac]::-webkit-calendar-picker-indicator {\n  display: none;\n}\n";
+var css_248z = "\ninput[data-v-4ab76bac] {\n  min-width: 0;\n  background: none;\n  outline: none;\n}\n";
 styleInject(css_248z);
 
 script.render = render;